From ddd23ab197f03273d82f9e6062d50020c75a46a5 Mon Sep 17 00:00:00 2001 From: Richard Moorhead Date: Tue, 27 Jul 2021 00:51:31 -0500 Subject: [PATCH 01/72] fix java8 datetime jaxrs-resteasy (#10014) --- bin/configs/jaxrs-resteasy-java8.yaml | 8 + .../JavaJaxRS/resteasy/JacksonConfig.mustache | 18 +- .../resources/JavaJaxRS/resteasy/pom.mustache | 12 +- .../jaxrs-resteasy/default-value/pom.xml | 3 +- .../org/openapitools/api/JacksonConfig.java | 8 +- .../petstore/jaxrs-resteasy/default/pom.xml | 3 +- .../org/openapitools/api/JacksonConfig.java | 8 +- .../java8/.openapi-generator-ignore | 23 +++ .../java8/.openapi-generator/FILES | 32 +++ .../java8/.openapi-generator/VERSION | 1 + .../petstore/jaxrs-resteasy/java8/README.md | 24 +++ .../jaxrs-resteasy/java8/build.gradle | 36 ++++ .../petstore/jaxrs-resteasy/java8/pom.xml | 192 ++++++++++++++++++ .../jaxrs-resteasy/java8/settings.gradle | 1 + .../org/openapitools/api/ApiException.java | 32 +++ .../org/openapitools/api/ApiOriginFilter.java | 22 ++ .../openapitools/api/ApiResponseMessage.java | 69 +++++++ .../org/openapitools/api/JacksonConfig.java | 24 +++ .../openapitools/api/LocalDateProvider.java | 31 +++ .../openapitools/api/NotFoundException.java | 10 + .../api/OffsetDateTimeProvider.java | 31 +++ .../gen/java/org/openapitools/api/PetApi.java | 175 ++++++++++++++++ .../org/openapitools/api/PetApiService.java | 38 ++++ .../openapitools/api/RFC3339DateFormat.java | 38 ++++ .../org/openapitools/api/RestApplication.java | 9 + .../java/org/openapitools/api/StoreApi.java | 90 ++++++++ .../org/openapitools/api/StoreApiService.java | 28 +++ .../java/org/openapitools/api/StringUtil.java | 42 ++++ .../java/org/openapitools/api/UserApi.java | 134 ++++++++++++ .../org/openapitools/api/UserApiService.java | 36 ++++ .../java/org/openapitools/model/Category.java | 83 ++++++++ .../openapitools/model/ModelApiResponse.java | 98 +++++++++ .../java/org/openapitools/model/Order.java | 169 +++++++++++++++ .../gen/java/org/openapitools/model/Pet.java | 174 ++++++++++++++++ .../gen/java/org/openapitools/model/Tag.java | 83 ++++++++ .../gen/java/org/openapitools/model/User.java | 174 ++++++++++++++++ .../api/impl/PetApiServiceImpl.java | 64 ++++++ .../api/impl/StoreApiServiceImpl.java | 42 ++++ .../api/impl/UserApiServiceImpl.java | 62 ++++++ .../src/main/webapp/WEB-INF/jboss-web.xml | 3 + .../java8/src/main/webapp/WEB-INF/web.xml | 14 ++ .../petstore/jaxrs-resteasy/joda/pom.xml | 3 +- .../org/openapitools/api/JacksonConfig.java | 8 +- 43 files changed, 2135 insertions(+), 20 deletions(-) create mode 100644 bin/configs/jaxrs-resteasy-java8.yaml create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator-ignore create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/README.md create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/build.gradle create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/pom.xml create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/settings.gradle create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiException.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiOriginFilter.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiResponseMessage.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/JacksonConfig.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/LocalDateProvider.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/NotFoundException.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/OffsetDateTimeProvider.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApi.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RFC3339DateFormat.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RestApplication.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StringUtil.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/jboss-web.xml create mode 100644 samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/web.xml diff --git a/bin/configs/jaxrs-resteasy-java8.yaml b/bin/configs/jaxrs-resteasy-java8.yaml new file mode 100644 index 00000000000..bf23076f8c8 --- /dev/null +++ b/bin/configs/jaxrs-resteasy-java8.yaml @@ -0,0 +1,8 @@ +generatorName: jaxrs-resteasy +outputDir: samples/server/petstore/jaxrs-resteasy/java8 +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy +additionalProperties: + artifactId: jaxrs-resteasy-java8-server + hideGenerationTimestamp: "true" + dateLibrary: java8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache index 5a0da702332..43af8d12996 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache @@ -1,14 +1,19 @@ package {{invokerPackage}}; +import com.fasterxml.jackson.databind.ObjectMapper; +{{#java8}} +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +{{/java8}} +{{^java8}} import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.fasterxml.jackson.datatype.joda.JodaModule; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.format.ISODateTimeFormat; +{{/java8}} import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; @@ -21,7 +26,10 @@ public class JacksonConfig implements ContextResolver { public JacksonConfig() throws Exception { objectMapper = new ObjectMapper() - .setDateFormat(new RFC3339DateFormat()) +{{#java8}} + .registerModule(new JavaTimeModule()) +{{/java8}} +{{^java8}} .registerModule(new JodaModule() { { addSerializer(DateTime.class, new StdSerializer(DateTime.class) { @@ -38,10 +46,12 @@ public class JacksonConfig implements ContextResolver { }); } - }); + }) +{{/java8}} + .setDateFormat(new RFC3339DateFormat()); } public ObjectMapper getContext(Class arg0) { return objectMapper; } -} \ No newline at end of file +} 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 7c6ac1edc3e..997588b8b75 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -126,16 +126,25 @@ provided + {{#java8}} + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + {{/java8}} + {{^java8}} com.fasterxml.jackson.datatype jackson-datatype-joda - 2.11.2 + ${jackson-version} joda-time joda-time 2.7 + {{/java8}} io.swagger swagger-jaxrs @@ -189,6 +198,7 @@ 1.5.22 + 2.11.2 9.2.9.v20150224 3.13.0.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml index 08c28ffc604..ec4d3e12eb8 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml @@ -129,7 +129,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.11.2 + ${jackson-version} joda-time @@ -187,6 +187,7 @@ 1.5.22 + 2.11.2 9.2.9.v20150224 3.13.0.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/src/gen/java/org/openapitools/api/JacksonConfig.java b/samples/server/petstore/jaxrs-resteasy/default-value/src/gen/java/org/openapitools/api/JacksonConfig.java index a7d1fcae4b8..0505794e04e 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/src/gen/java/org/openapitools/api/JacksonConfig.java +++ b/samples/server/petstore/jaxrs-resteasy/default-value/src/gen/java/org/openapitools/api/JacksonConfig.java @@ -1,8 +1,8 @@ package org.openapitools.api; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.fasterxml.jackson.datatype.joda.JodaModule; @@ -21,7 +21,6 @@ public class JacksonConfig implements ContextResolver { public JacksonConfig() throws Exception { objectMapper = new ObjectMapper() - .setDateFormat(new RFC3339DateFormat()) .registerModule(new JodaModule() { { addSerializer(DateTime.class, new StdSerializer(DateTime.class) { @@ -38,10 +37,11 @@ public class JacksonConfig implements ContextResolver { }); } - }); + }) + .setDateFormat(new RFC3339DateFormat()); } public ObjectMapper getContext(Class arg0) { return objectMapper; } -} \ No newline at end of file +} diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index 6843aedfc2d..06b45bb1e6a 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -129,7 +129,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.11.2 + ${jackson-version} joda-time @@ -187,6 +187,7 @@ 1.5.22 + 2.11.2 9.2.9.v20150224 3.13.0.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/JacksonConfig.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/JacksonConfig.java index a7d1fcae4b8..0505794e04e 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/JacksonConfig.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/JacksonConfig.java @@ -1,8 +1,8 @@ package org.openapitools.api; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.fasterxml.jackson.datatype.joda.JodaModule; @@ -21,7 +21,6 @@ public class JacksonConfig implements ContextResolver { public JacksonConfig() throws Exception { objectMapper = new ObjectMapper() - .setDateFormat(new RFC3339DateFormat()) .registerModule(new JodaModule() { { addSerializer(DateTime.class, new StdSerializer(DateTime.class) { @@ -38,10 +37,11 @@ public class JacksonConfig implements ContextResolver { }); } - }); + }) + .setDateFormat(new RFC3339DateFormat()); } public ObjectMapper getContext(Class arg0) { return objectMapper; } -} \ No newline at end of file +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator-ignore b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES new file mode 100644 index 00000000000..654b846c19e --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES @@ -0,0 +1,32 @@ +.openapi-generator-ignore +README.md +build.gradle +pom.xml +settings.gradle +src/gen/java/org/openapitools/api/ApiException.java +src/gen/java/org/openapitools/api/ApiOriginFilter.java +src/gen/java/org/openapitools/api/ApiResponseMessage.java +src/gen/java/org/openapitools/api/JacksonConfig.java +src/gen/java/org/openapitools/api/LocalDateProvider.java +src/gen/java/org/openapitools/api/NotFoundException.java +src/gen/java/org/openapitools/api/OffsetDateTimeProvider.java +src/gen/java/org/openapitools/api/PetApi.java +src/gen/java/org/openapitools/api/PetApiService.java +src/gen/java/org/openapitools/api/RFC3339DateFormat.java +src/gen/java/org/openapitools/api/RestApplication.java +src/gen/java/org/openapitools/api/StoreApi.java +src/gen/java/org/openapitools/api/StoreApiService.java +src/gen/java/org/openapitools/api/StringUtil.java +src/gen/java/org/openapitools/api/UserApi.java +src/gen/java/org/openapitools/api/UserApiService.java +src/gen/java/org/openapitools/model/Category.java +src/gen/java/org/openapitools/model/ModelApiResponse.java +src/gen/java/org/openapitools/model/Order.java +src/gen/java/org/openapitools/model/Pet.java +src/gen/java/org/openapitools/model/Tag.java +src/gen/java/org/openapitools/model/User.java +src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java +src/main/webapp/WEB-INF/jboss-web.xml +src/main/webapp/WEB-INF/web.xml diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/README.md b/samples/server/petstore/jaxrs-resteasy/java8/README.md new file mode 100644 index 00000000000..050351dfcdb --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/README.md @@ -0,0 +1,24 @@ +# JAX-RS/RESTEasy server with OpenAPI + +## Overview +This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using an +[OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. + +This is an example of building a OpenAPI-enabled JAX-RS server. +This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework. +RESTEasy is used as JAX-RS implementation library and is defined as dependency. + +To run the server, please execute the following: + +``` +mvn -Djetty.http.port=8080 package org.eclipse.jetty:jetty-maven-plugin:run +``` + +You can then view the OpenAPI v2 specification here: + +``` +http://localhost:8080/v2/swagger.json +``` + +Note that if you have configured the `host` to be something other than localhost, the calls through +swagger-ui will be directed to that host and not localhost! \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle new file mode 100644 index 00000000000..b4805e5de7b --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle @@ -0,0 +1,36 @@ +apply plugin: 'war' + +project.version = "1.0.0" +project.group = "org.openapitools" + +repositories { + maven { url "https://repo1.maven.org/maven2" } +} + +dependencies { + providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' + providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' + providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' + 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.22' + 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.9.9' + compile 'joda-time:joda-time:2.7' + //TODO: swaggerFeature + compile 'io.swagger:swagger-jaxrs:1.5.12' + + testCompile 'junit:junit:4.13', + 'org.hamcrest:hamcrest-core:1.3' +} + +sourceSets { + main { + java { + srcDir 'src/gen/java' + } + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml new file mode 100644 index 00000000000..925aad94223 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml @@ -0,0 +1,192 @@ + + 4.0.0 + org.openapitools + jaxrs-resteasy-java8-server + war + jaxrs-resteasy-java8-server + 1.0.0 + + src/main/java + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + + src/gen/java + + + + + + + + + + + javax + javaee-api + 7.0 + provided + + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + + + javax.servlet + servlet-api + ${servlet-api-version} + provided + + + + org.jboss.resteasy + resteasy-jaxrs + ${resteasy-version} + provided + + + org.jboss.resteasy + jaxrs-api + 3.0.12.Final + provided + + + org.jboss.resteasy + resteasy-validator-provider-11 + 3.6.3.SP1 + provided + + + org.jboss.resteasy + resteasy-multipart-provider + ${resteasy-version} + provided + + + org.jboss.resteasy + resteasy-jackson2-provider + ${resteasy-version} + provided + + + javax.annotation + javax.annotation-api + 1.2 + provided + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + io.swagger + swagger-jaxrs + ${swagger-core-version} + + + junit + junit + ${junit-version} + test + + + org.testng + testng + 6.8.8 + test + + + junit + junit + + + snakeyaml + org.yaml + + + bsh + org.beanshell + + + + + + javax.validation + validation-api + 1.1.0.Final + provided + + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + + + 1.5.22 + 2.11.2 + 9.2.9.v20150224 + 3.13.0.Final + 1.6.3 + 4.13.1 + 2.5 + + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/settings.gradle b/samples/server/petstore/jaxrs-resteasy/java8/settings.gradle new file mode 100644 index 00000000000..663aa14bae8 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "jaxrs-resteasy-java8-server" \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiException.java new file mode 100644 index 00000000000..6e0c12c35ca --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiException.java @@ -0,0 +1,32 @@ +package org.openapitools.api; + +/** + * The exception that can be used to store the HTTP status code returned by an API response. + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class ApiException extends Exception { + + /** The HTTP status code. */ + private int code; + + /** + * Constructor. + * + * @param code The HTTP status code. + * @param msg The error message. + */ + public ApiException(int code, String msg) { + super(msg); + this.code = code; + } + + /** + * Get the HTTP status code. + * + * @return The HTTP status code. + */ + public int getCode() { + return code; + } + +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiOriginFilter.java new file mode 100644 index 00000000000..ae4ceb1a77c --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiOriginFilter.java @@ -0,0 +1,22 @@ +package org.openapitools.api; + +import java.io.IOException; + +import javax.servlet.*; +import javax.servlet.http.HttpServletResponse; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class ApiOriginFilter implements javax.servlet.Filter { + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } + + public void destroy() {} + + public void init(FilterConfig filterConfig) throws ServletException {} +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiResponseMessage.java new file mode 100644 index 00000000000..35fc693af01 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/ApiResponseMessage.java @@ -0,0 +1,69 @@ +package org.openapitools.api; + +import javax.xml.bind.annotation.XmlTransient; + +@javax.xml.bind.annotation.XmlRootElement +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class ApiResponseMessage { + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; + + int code; + String type; + String message; + + public ApiResponseMessage(){} + + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } + + @XmlTransient + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/JacksonConfig.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/JacksonConfig.java new file mode 100644 index 00000000000..56feb995554 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/JacksonConfig.java @@ -0,0 +1,24 @@ +package org.openapitools.api; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; +import java.io.IOException; + +@Provider +public class JacksonConfig implements ContextResolver { + private final ObjectMapper objectMapper; + + public JacksonConfig() throws Exception { + + objectMapper = new ObjectMapper() + .registerModule(new JavaTimeModule()) + .setDateFormat(new RFC3339DateFormat()); + } + + public ObjectMapper getContext(Class arg0) { + return objectMapper; + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/LocalDateProvider.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/LocalDateProvider.java new file mode 100644 index 00000000000..a858315c384 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/LocalDateProvider.java @@ -0,0 +1,31 @@ +package org.openapitools.api; + +import java.time.LocalDate; +import javax.ws.rs.ext.ParamConverter; +import javax.ws.rs.ext.ParamConverterProvider; +import javax.ws.rs.ext.Provider; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +@Provider +public class LocalDateProvider implements ParamConverterProvider { + + public static class LocalDateConverter implements ParamConverter { + + public LocalDate fromString(String string) { + LocalDate localDate = LocalDate.parse(string); + return localDate; + } + + public String toString(LocalDate t) { + return t.toString(); + } + } + + public ParamConverter getConverter(Class type, Type type1, Annotation[] antns) { + if (LocalDate.class.equals(type)) { + return (ParamConverter) new LocalDateConverter(); + } + return null; + } +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/NotFoundException.java new file mode 100644 index 00000000000..7bba9680d59 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/NotFoundException.java @@ -0,0 +1,10 @@ +package org.openapitools.api; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class NotFoundException extends ApiException { + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/OffsetDateTimeProvider.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/OffsetDateTimeProvider.java new file mode 100644 index 00000000000..291aed756c7 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/OffsetDateTimeProvider.java @@ -0,0 +1,31 @@ +package org.openapitools.api; + +import java.time.OffsetDateTime; +import javax.ws.rs.ext.ParamConverter; +import javax.ws.rs.ext.ParamConverterProvider; +import javax.ws.rs.ext.Provider; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +@Provider +public class OffsetDateTimeProvider implements ParamConverterProvider { + + public static class OffsetDateTimeConverter implements ParamConverter { + + public OffsetDateTime fromString(String string) { + OffsetDateTime offsetDateTime = OffsetDateTime.parse(string); + return offsetDateTime; + } + + public String toString(OffsetDateTime t) { + return t.toString(); + } + } + + public ParamConverter getConverter(Class type, Type type1, Annotation[] antns) { + if (OffsetDateTime.class.equals(type)) { + return (ParamConverter) new OffsetDateTimeConverter(); + } + return null; + } +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApi.java new file mode 100644 index 00000000000..327b00e46c7 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApi.java @@ -0,0 +1,175 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.PetApiService; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.inject.Inject; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; + +@Path("/pet") + + +@io.swagger.annotations.Api(description = "the pet API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class PetApi { + + @Inject PetApiService service; + + @POST + + @Consumes({ "application/json", "application/xml" }) + + @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.addPet(body,securityContext); + } + @DELETE + @Path("/{petId}") + + + @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) + public Response deletePet( @PathParam("petId") Long petId, @ApiParam(value = "" ) @HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext) + throws NotFoundException { + return service.deletePet(petId,apiKey,securityContext); + } + @GET + @Path("/findByStatus") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) + public Response findPetsByStatus( @NotNull @QueryParam("status") List status,@Context SecurityContext securityContext) + throws NotFoundException { + return service.findPetsByStatus(status,securityContext); + } + @GET + @Path("/findByTags") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) + public Response findPetsByTags( @NotNull @QueryParam("tags") List tags,@Context SecurityContext securityContext) + throws NotFoundException { + return service.findPetsByTags(tags,securityContext); + } + @GET + @Path("/{petId}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { + @io.swagger.annotations.Authorization(value = "api_key") + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) }) + public Response getPetById( @PathParam("petId") Long petId,@Context SecurityContext securityContext) + throws NotFoundException { + return service.getPetById(petId,securityContext); + } + @PUT + + @Consumes({ "application/json", "application/xml" }) + + @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.updatePet(body,securityContext); + } + @POST + @Path("/{petId}") + @Consumes({ "application/x-www-form-urlencoded" }) + + @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) + public Response updatePetWithForm( @PathParam("petId") Long petId,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status,@Context SecurityContext securityContext) + throws NotFoundException { + return service.updatePetWithForm(petId,name,status,securityContext); + } + @POST + @Path("/{petId}/uploadImage") + @Consumes({ "multipart/form-data" }) + @Produces({ "application/json" }) + @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) + public Response uploadFile(MultipartFormDataInput input, @PathParam("petId") Long petId,@Context SecurityContext securityContext) + throws NotFoundException { + return service.uploadFile(input,petId,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java new file mode 100644 index 00000000000..5415004bc63 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java @@ -0,0 +1,38 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; + + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public interface PetApiService { + Response addPet(Pet body,SecurityContext securityContext) + throws NotFoundException; + Response deletePet(Long petId,String apiKey,SecurityContext securityContext) + throws NotFoundException; + Response findPetsByStatus(List status,SecurityContext securityContext) + throws NotFoundException; + Response findPetsByTags(List tags,SecurityContext securityContext) + throws NotFoundException; + Response getPetById(Long petId,SecurityContext securityContext) + throws NotFoundException; + Response updatePet(Pet body,SecurityContext securityContext) + throws NotFoundException; + Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) + throws NotFoundException; + Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) + throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RFC3339DateFormat.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RFC3339DateFormat.java new file mode 100644 index 00000000000..3c9230efefe --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RFC3339DateFormat.java @@ -0,0 +1,38 @@ +package org.openapitools.api; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return this; + } +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RestApplication.java new file mode 100644 index 00000000000..05e47844145 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/RestApplication.java @@ -0,0 +1,9 @@ +package org.openapitools.api; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/v2") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java new file mode 100644 index 00000000000..a7971232738 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java @@ -0,0 +1,90 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.StoreApiService; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.inject.Inject; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +@Path("/store") + + +@io.swagger.annotations.Api(description = "the store API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class StoreApi { + + @Inject StoreApiService service; + + @DELETE + @Path("/order/{orderId}") + + + @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) + public Response deleteOrder( @PathParam("orderId") String orderId,@Context SecurityContext securityContext) + throws NotFoundException { + return service.deleteOrder(orderId,securityContext); + } + @GET + @Path("/inventory") + + @Produces({ "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { + @io.swagger.annotations.Authorization(value = "api_key") + }, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) + public Response getInventory(@Context SecurityContext securityContext) + throws NotFoundException { + return service.getInventory(securityContext); + } + @GET + @Path("/order/{orderId}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) + public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext) + throws NotFoundException { + return service.getOrderById(orderId,securityContext); + } + @POST + @Path("/order") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.placeOrder(body,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java new file mode 100644 index 00000000000..ed4c8338a60 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -0,0 +1,28 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public interface StoreApiService { + Response deleteOrder(String orderId,SecurityContext securityContext) + throws NotFoundException; + Response getInventory(SecurityContext securityContext) + throws NotFoundException; + Response getOrderById(Long orderId,SecurityContext securityContext) + throws NotFoundException; + Response placeOrder(Order body,SecurityContext securityContext) + throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StringUtil.java new file mode 100644 index 00000000000..4bbe3a4447b --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StringUtil.java @@ -0,0 +1,42 @@ +package org.openapitools.api; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) return true; + if (value != null && value.equalsIgnoreCase(str)) return true; + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

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

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) return ""; + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java new file mode 100644 index 00000000000..d325a05a54f --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java @@ -0,0 +1,134 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.UserApiService; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.util.List; +import org.openapitools.model.User; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.inject.Inject; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +@Path("/user") + + +@io.swagger.annotations.Api(description = "the user API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class UserApi { + + @Inject UserApiService service; + + @POST + + + + @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.createUser(body,securityContext); + } + @POST + @Path("/createWithArray") + + + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.createUsersWithArrayInput(body,securityContext); + } + @POST + @Path("/createWithList") + + + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.createUsersWithListInput(body,securityContext); + } + @DELETE + @Path("/{username}") + + + @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response deleteUser( @PathParam("username") String username,@Context SecurityContext securityContext) + throws NotFoundException { + return service.deleteUser(username,securityContext); + } + @GET + @Path("/{username}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response getUserByName( @PathParam("username") String username,@Context SecurityContext securityContext) + throws NotFoundException { + return service.getUserByName(username,securityContext); + } + @GET + @Path("/login") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) }) + public Response loginUser( @NotNull @QueryParam("username") String username, @NotNull @QueryParam("password") String password,@Context SecurityContext securityContext) + throws NotFoundException { + return service.loginUser(username,password,securityContext); + } + @GET + @Path("/logout") + + + @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response logoutUser(@Context SecurityContext securityContext) + throws NotFoundException { + return service.logoutUser(securityContext); + } + @PUT + @Path("/{username}") + + + @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body,@Context SecurityContext securityContext) + throws NotFoundException { + return service.updateUser(username,body,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java new file mode 100644 index 00000000000..35d72d42112 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java @@ -0,0 +1,36 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + + +import java.util.List; +import org.openapitools.model.User; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public interface UserApiService { + Response createUser(User body,SecurityContext securityContext) + throws NotFoundException; + Response createUsersWithArrayInput(List body,SecurityContext securityContext) + throws NotFoundException; + Response createUsersWithListInput(List body,SecurityContext securityContext) + throws NotFoundException; + Response deleteUser(String username,SecurityContext securityContext) + throws NotFoundException; + Response getUserByName(String username,SecurityContext securityContext) + throws NotFoundException; + Response loginUser(String username,String password,SecurityContext securityContext) + throws NotFoundException; + Response logoutUser(SecurityContext securityContext) + throws NotFoundException; + Response updateUser(String username,User body,SecurityContext securityContext) + throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java new file mode 100644 index 00000000000..4884ee2c4c2 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java @@ -0,0 +1,83 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class Category { + + private Long id; + private String name; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Category category = (Category) o; + return Objects.equals(id, category.id) && + Objects.equals(name, category.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java new file mode 100644 index 00000000000..d3a12b7874d --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -0,0 +1,98 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class ModelApiResponse { + + private Integer code; + private String type; + private String message; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("code") + public Integer getCode() { + return code; + } + public void setCode(Integer code) { + this.code = code; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("type") + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("message") + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelApiResponse _apiResponse = (ModelApiResponse) o; + return Objects.equals(code, _apiResponse.code) && + Objects.equals(type, _apiResponse.type) && + Objects.equals(message, _apiResponse.message); + } + + @Override + public int hashCode() { + return Objects.hash(code, type, message); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelApiResponse {\n"); + + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java new file mode 100644 index 00000000000..2987afa9926 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java @@ -0,0 +1,169 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class Order { + + private Long id; + private Long petId; + private Integer quantity; + private OffsetDateTime shipDate; + + /** + * Order Status + */ + public enum StatusEnum { + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + } + + private StatusEnum status; + private Boolean complete = false; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("petId") + public Long getPetId() { + return petId; + } + public void setPetId(Long petId) { + this.petId = petId; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("quantity") + public Integer getQuantity() { + return quantity; + } + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("shipDate") + public OffsetDateTime getShipDate() { + return shipDate; + } + public void setShipDate(OffsetDateTime shipDate) { + this.shipDate = shipDate; + } + + /** + * Order Status + **/ + + @ApiModelProperty(value = "Order Status") + @JsonProperty("status") + public StatusEnum getStatus() { + return status; + } + public void setStatus(StatusEnum status) { + this.status = status; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("complete") + public Boolean getComplete() { + return complete; + } + public void setComplete(Boolean complete) { + this.complete = complete; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Order order = (Order) o; + return Objects.equals(id, order.id) && + Objects.equals(petId, order.petId) && + Objects.equals(quantity, order.quantity) && + Objects.equals(shipDate, order.shipDate) && + Objects.equals(status, order.status) && + Objects.equals(complete, order.complete); + } + + @Override + public int hashCode() { + return Objects.hash(id, petId, quantity, shipDate, status, complete); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java new file mode 100644 index 00000000000..73788837d0f --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java @@ -0,0 +1,174 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.model.Category; +import org.openapitools.model.Tag; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class Pet { + + private Long id; + private Category category; + private String name; + private List photoUrls = new ArrayList<>(); + private List tags = new ArrayList<>(); + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + } + + private StatusEnum status; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("category") + public Category getCategory() { + return category; + } + public void setCategory(Category category) { + this.category = category; + } + + /** + **/ + + @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") + @NotNull + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + /** + **/ + + @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") + @NotNull + public List getPhotoUrls() { + return photoUrls; + } + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("tags") + public List getTags() { + return tags; + } + public void setTags(List tags) { + this.tags = tags; + } + + /** + * pet status in the store + **/ + + @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") + public StatusEnum getStatus() { + return status; + } + public void setStatus(StatusEnum status) { + this.status = status; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(id, pet.id) && + Objects.equals(category, pet.category) && + Objects.equals(name, pet.name) && + Objects.equals(photoUrls, pet.photoUrls) && + Objects.equals(tags, pet.tags) && + Objects.equals(status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java new file mode 100644 index 00000000000..afd723dee10 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java @@ -0,0 +1,83 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class Tag { + + private Long id; + private String name; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Tag tag = (Tag) o; + return Objects.equals(id, tag.id) && + Objects.equals(name, tag.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java new file mode 100644 index 00000000000..2e649203067 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java @@ -0,0 +1,174 @@ +package org.openapitools.model; + +import java.util.Objects; +import java.util.ArrayList; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; +import io.swagger.annotations.*; + +@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class User { + + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("username") + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("firstName") + public String getFirstName() { + return firstName; + } + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("lastName") + public String getLastName() { + return lastName; + } + public void setLastName(String lastName) { + this.lastName = lastName; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("email") + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("password") + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + + /** + **/ + + @ApiModelProperty(value = "") + @JsonProperty("phone") + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + + /** + * User Status + **/ + + @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") + public Integer getUserStatus() { + return userStatus; + } + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(id, user.id) && + Objects.equals(username, user.username) && + Objects.equals(firstName, user.firstName) && + Objects.equals(lastName, user.lastName) && + Objects.equals(email, user.email) && + Objects.equals(password, user.password) && + Objects.equals(phone, user.phone) && + Objects.equals(userStatus, user.userStatus); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java new file mode 100644 index 00000000000..0b264cc92ce --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -0,0 +1,64 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; + + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.enterprise.context.RequestScoped; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@RequestScoped +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class PetApiServiceImpl implements PetApiService { + public Response addPet(Pet body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response deletePet(Long petId,String apiKey,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response findPetsByStatus(List status,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response findPetsByTags(List tags,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response getPetById(Long petId,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response updatePet(Pet body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java new file mode 100644 index 00000000000..4669635c259 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -0,0 +1,42 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.enterprise.context.RequestScoped; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@RequestScoped +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class StoreApiServiceImpl implements StoreApiService { + public Response deleteOrder(String orderId,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response getInventory(SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response getOrderById(Long orderId,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response placeOrder(Order body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java new file mode 100644 index 00000000000..40d14d0be55 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java @@ -0,0 +1,62 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + + +import java.util.List; +import org.openapitools.model.User; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.enterprise.context.RequestScoped; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@RequestScoped +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") +public class UserApiServiceImpl implements UserApiService { + public Response createUser(User body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response createUsersWithArrayInput(List body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response createUsersWithListInput(List body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response deleteUser(String username,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response getUserByName(String username,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response loginUser(String username,String password,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response logoutUser(SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + public Response updateUser(String username,User body,SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/jboss-web.xml b/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/jboss-web.xml new file mode 100644 index 00000000000..9c05ed07b78 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/jboss-web.xml @@ -0,0 +1,3 @@ + + /v2 + \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000000..f52301872f8 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,14 @@ + + + + + ApiOriginFilter + org.openapitools.api.ApiOriginFilter + + + ApiOriginFilter + /* + + diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index eccafff3b7e..0825ab39dc3 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -129,7 +129,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.11.2 + ${jackson-version} joda-time @@ -187,6 +187,7 @@ 1.5.22 + 2.11.2 9.2.9.v20150224 3.13.0.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/JacksonConfig.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/JacksonConfig.java index a7d1fcae4b8..0505794e04e 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/JacksonConfig.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/JacksonConfig.java @@ -1,8 +1,8 @@ package org.openapitools.api; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.fasterxml.jackson.datatype.joda.JodaModule; @@ -21,7 +21,6 @@ public class JacksonConfig implements ContextResolver { public JacksonConfig() throws Exception { objectMapper = new ObjectMapper() - .setDateFormat(new RFC3339DateFormat()) .registerModule(new JodaModule() { { addSerializer(DateTime.class, new StdSerializer(DateTime.class) { @@ -38,10 +37,11 @@ public class JacksonConfig implements ContextResolver { }); } - }); + }) + .setDateFormat(new RFC3339DateFormat()); } public ObjectMapper getContext(Class arg0) { return objectMapper; } -} \ No newline at end of file +} From aa4018d09b062c742814abf42a60633fb10c80bf Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Tue, 27 Jul 2021 08:57:07 +0300 Subject: [PATCH 02/72] [Java] fix nullable arrays when JsonNullable is used (#10012) --- .../java-webclient-nullable-array.yaml | 7 + .../languages/AbstractJavaCodegen.java | 7 + .../languages/JavaJerseyServerCodegen.java | 3 + .../Java/libraries/jersey2/pojo.mustache | 21 +- .../Java/libraries/native/pojo.mustache | 21 +- .../src/main/resources/Java/pojo.mustache | 21 +- .../main/resources/JavaSpring/pojo.mustache | 21 +- .../java/JavaCXFClientCodegenTest.java | 2 +- .../3_0/schema-with-nullable-arrays.yaml | 43 ++ pom.xml | 1 + .../openapitools/client/model/EnumTest.java | 18 +- .../client/model/HealthCheckResult.java | 18 +- .../client/model/NullableClass.java | 36 +- .../java/webclient-nulable-arrays/.gitignore | 21 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 29 + .../.openapi-generator/VERSION | 1 + .../java/webclient-nulable-arrays/.travis.yml | 22 + .../java/webclient-nulable-arrays/README.md | 128 ++++ .../webclient-nulable-arrays/api/openapi.yaml | 49 ++ .../webclient-nulable-arrays/build.gradle | 141 ++++ .../java/webclient-nulable-arrays/build.sbt | 1 + .../docs/ByteArrayObject.md | 17 + .../docs/DefaultApi.md | 69 ++ .../java/webclient-nulable-arrays/git_push.sh | 58 ++ .../gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../java/webclient-nulable-arrays/gradlew | 185 +++++ .../java/webclient-nulable-arrays/gradlew.bat | 89 +++ .../java/webclient-nulable-arrays/pom.xml | 138 ++++ .../webclient-nulable-arrays/settings.gradle | 1 + .../src/main/AndroidManifest.xml | 3 + .../org/openapitools/client/ApiClient.java | 720 ++++++++++++++++++ .../client/JavaTimeFormatter.java | 64 ++ .../client/RFC3339DateFormat.java | 55 ++ .../client/ServerConfiguration.java | 58 ++ .../openapitools/client/ServerVariable.java | 23 + .../org/openapitools/client/StringUtil.java | 83 ++ .../openapitools/client/api/DefaultApi.java | 96 +++ .../openapitools/client/auth/ApiKeyAuth.java | 62 ++ .../client/auth/Authentication.java | 14 + .../client/auth/HttpBasicAuth.java | 39 + .../client/auth/HttpBearerAuth.java | 39 + .../client/model/ByteArrayObject.java | 271 +++++++ .../client/api/DefaultApiTest.java | 47 ++ .../client/model/ByteArrayObjectTest.java | 61 ++ .../openapitools/client/model/EnumTest.java | 18 +- .../client/model/HealthCheckResult.java | 18 +- .../client/model/NullableClass.java | 36 +- .../model/AdditionalPropertiesClass.java | 18 +- .../openapitools/client/model/Drawing.java | 18 +- .../openapitools/client/model/EnumTest.java | 18 +- .../client/model/HealthCheckResult.java | 18 +- .../client/model/NullableClass.java | 36 +- .../org/openapitools/client/model/User.java | 22 +- 56 files changed, 2965 insertions(+), 70 deletions(-) create mode 100644 bin/configs/java-webclient-nullable-array.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/.gitignore create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/.travis.yml create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/README.md create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/build.gradle create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/build.sbt create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/git_push.sh create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/gradle.properties create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/gradlew create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/pom.xml create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/settings.gradle create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java create mode 100644 samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java diff --git a/bin/configs/java-webclient-nullable-array.yaml b/bin/configs/java-webclient-nullable-array.yaml new file mode 100644 index 00000000000..224f2285208 --- /dev/null +++ b/bin/configs/java-webclient-nullable-array.yaml @@ -0,0 +1,7 @@ +generatorName: java +outputDir: samples/client/petstore/java/webclient-nulable-arrays +library: webclient +inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml +additionalProperties: + artifactId: petstore-webclient-nullable-arrays + hideGenerationTimestamp: "true" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index aaa988a6109..a5d05d09cb6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1219,6 +1219,13 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code model.imports.add("ApiModelProperty"); model.imports.add("ApiModel"); } + + if (openApiNullable) { + if (Boolean.FALSE.equals(property.required) && Boolean.TRUE.equals(property.isNullable)) { + model.imports.add("JsonNullable"); + model.getVendorExtensions().put("x-jackson-optional-nullable-helpers", true); + } + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java index 10e354d6f7f..57ad135e867 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java @@ -126,6 +126,9 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen { supportingFiles.add(new SupportingFile("web.mustache", ("src/main/webapp/WEB-INF"), "web.xml") .doNotOverwrite()); supportingFiles.add(new SupportingFile("StringUtil.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java")); + + // JsonNullable is not implemented for this generator + openApiNullable = false; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index 9a4c6dd3c90..55dc3717100 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -278,13 +278,17 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return false; }{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o; - return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && + return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public int hashCode() { @@ -292,9 +296,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public String toString() { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index e1350909a53..2db2da784e9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -281,13 +281,17 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return false; }{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o; - return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && + return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public int hashCode() { @@ -295,9 +299,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public String toString() { diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 6590b93824d..77d080ccba3 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -255,12 +255,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return false; }{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o; - return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && + return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public int hashCode() { @@ -268,9 +272,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); {{/useReflectionEqualsHashCode}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public String toString() { diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 3938d4d289e..de2f292341e 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -132,16 +132,29 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}} return false; }{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o; - return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && + return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return true;{{/hasVars}} - } + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public int hashCode() { - return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); - } + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public String toString() { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java index 13b247940f5..abe7aee3411 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java @@ -276,7 +276,7 @@ public class JavaCXFClientCodegenTest { codegenProperty.isNullable = true; codegen.postProcessModelProperty(codegenModel, codegenProperty); - Assert.assertFalse(codegenModel.imports.contains("JsonNullable")); + Assert.assertTrue(codegenModel.imports.contains("JsonNullable")); Assert.assertFalse(codegenModel.imports.contains("JsonIgnore")); Assert.assertNull(codegenProperty.getVendorExtensions().get("x-is-jackson-optional-nullable")); } diff --git a/modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml b/modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml new file mode 100644 index 00000000000..9a94a2e548a --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml @@ -0,0 +1,43 @@ +openapi: 3.0.0 +info: + title: 'Minimal Example ' + description: byte Array error in equal method + version: v1 +paths: + /nullable-array-test: + get: + summary: '' + description: '' + operationId: '' + parameters: [] + responses: + '200': + description: '' + content: + application/json: + schema: + type: array + items: + "$ref": "#/components/schemas/ByteArrayObject" +components: + schemas: + ByteArrayObject: + type: object + properties: + nullableArray: + type: string + description: byte array. + format: byte + nullable: true + normalArray: + type: string + description: byte array. + format: byte + nullableString: + type: string + nullable: true + stringField: + type: string + intField: + type: number + format: int32 diff --git a/pom.xml b/pom.xml index 63dbee00700..38449ea2435 100644 --- a/pom.xml +++ b/pom.xml @@ -1343,6 +1343,7 @@ samples/client/petstore/java/resttemplate samples/client/petstore/java/resttemplate-withXml samples/client/petstore/java/webclient + samples/client/petstore/java/webclient-nulable-arrays samples/client/petstore/java/vertx samples/client/petstore/java/jersey2-java8-localdatetime samples/client/petstore/java/resteasy diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java index c9e35dd1b5e..a2bc31cdab7 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java @@ -26,6 +26,7 @@ import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.OuterEnumDefaultValue; import org.openapitools.client.model.OuterEnumInteger; import org.openapitools.client.model.OuterEnumIntegerDefaultValue; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -453,15 +454,28 @@ public class EnumTest { Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum) && + equalsNullable(this.outerEnum, enumTest.outerEnum) && Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) && Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) && Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java index fca0af36793..9ca1ed06b50 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -85,12 +86,25 @@ public class HealthCheckResult { return false; } HealthCheckResult healthCheckResult = (HealthCheckResult) o; - return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage); + return equalsNullable(this.nullableMessage, healthCheckResult.nullableMessage); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(nullableMessage); + return Objects.hash(hashCodeNullable(nullableMessage)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java index 8e58ce2fcea..a0cdc543f9c 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -568,24 +569,37 @@ public class NullableClass extends HashMap { return false; } NullableClass nullableClass = (NullableClass) o; - return Objects.equals(this.integerProp, nullableClass.integerProp) && - Objects.equals(this.numberProp, nullableClass.numberProp) && - Objects.equals(this.booleanProp, nullableClass.booleanProp) && - Objects.equals(this.stringProp, nullableClass.stringProp) && - Objects.equals(this.dateProp, nullableClass.dateProp) && - Objects.equals(this.datetimeProp, nullableClass.datetimeProp) && - Objects.equals(this.arrayNullableProp, nullableClass.arrayNullableProp) && - Objects.equals(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && + return equalsNullable(this.integerProp, nullableClass.integerProp) && + equalsNullable(this.numberProp, nullableClass.numberProp) && + equalsNullable(this.booleanProp, nullableClass.booleanProp) && + equalsNullable(this.stringProp, nullableClass.stringProp) && + equalsNullable(this.dateProp, nullableClass.dateProp) && + equalsNullable(this.datetimeProp, nullableClass.datetimeProp) && + equalsNullable(this.arrayNullableProp, nullableClass.arrayNullableProp) && + equalsNullable(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) && - Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) && - Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && + equalsNullable(this.objectNullableProp, nullableClass.objectNullableProp) && + equalsNullable(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable) && super.equals(o); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode()); + return Objects.hash(hashCodeNullable(integerProp), hashCodeNullable(numberProp), hashCodeNullable(booleanProp), hashCodeNullable(stringProp), hashCodeNullable(dateProp), hashCodeNullable(datetimeProp), hashCodeNullable(arrayNullableProp), hashCodeNullable(arrayAndItemsNullableProp), arrayItemsNullable, hashCodeNullable(objectNullableProp), hashCodeNullable(objectAndItemsNullableProp), objectItemsNullable, super.hashCode()); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.gitignore b/samples/client/petstore/java/webclient-nulable-arrays/.gitignore new file mode 100644 index 00000000000..a530464afa1 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES new file mode 100644 index 00000000000..eaed93f7b08 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES @@ -0,0 +1,29 @@ +.gitignore +.travis.yml +README.md +api/openapi.yaml +build.gradle +build.sbt +docs/ByteArrayObject.md +docs/DefaultApi.md +git_push.sh +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/AndroidManifest.xml +src/main/java/org/openapitools/client/ApiClient.java +src/main/java/org/openapitools/client/JavaTimeFormatter.java +src/main/java/org/openapitools/client/RFC3339DateFormat.java +src/main/java/org/openapitools/client/ServerConfiguration.java +src/main/java/org/openapitools/client/ServerVariable.java +src/main/java/org/openapitools/client/StringUtil.java +src/main/java/org/openapitools/client/api/DefaultApi.java +src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +src/main/java/org/openapitools/client/auth/Authentication.java +src/main/java/org/openapitools/client/auth/HttpBasicAuth.java +src/main/java/org/openapitools/client/auth/HttpBearerAuth.java +src/main/java/org/openapitools/client/model/ByteArrayObject.java diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.travis.yml b/samples/client/petstore/java/webclient-nulable-arrays/.travis.yml new file mode 100644 index 00000000000..1b6741c083c --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/.travis.yml @@ -0,0 +1,22 @@ +# +# Generated by OpenAPI Generator: https://openapi-generator.tech +# +# Ref: https://docs.travis-ci.com/user/languages/java/ +# +language: java +jdk: + - openjdk12 + - openjdk11 + - openjdk10 + - openjdk9 + - openjdk8 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew +script: + # test using maven + #- mvn test + # test using gradle + - gradle test + # test using sbt + # - sbt test diff --git a/samples/client/petstore/java/webclient-nulable-arrays/README.md b/samples/client/petstore/java/webclient-nulable-arrays/README.md new file mode 100644 index 00000000000..c74918e7d1c --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/README.md @@ -0,0 +1,128 @@ +# petstore-webclient-nullable-arrays + +Minimal Example + +- API version: v1 + +byte Array error in equal method + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + +## Requirements + +Building the API client library requires: + +1. Java 1.8+ +2. Maven/Gradle + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn clean install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn clean deploy +``` + +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + petstore-webclient-nullable-arrays + v1 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy +compile "org.openapitools:petstore-webclient-nullable-arrays:v1" +``` + +### Others + +At first generate the JAR by executing: + +```shell +mvn clean package +``` + +Then manually install the following JARs: + +- `target/petstore-webclient-nullable-arrays-v1.jar` +- `target/lib/*.jar` + +## Getting Started + +Please follow the [installation](#installation) instruction and execute the following Java code: + +```java + +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.DefaultApi; + +public class DefaultApiExample { + + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + try { + List result = apiInstance.nullableArrayTestGet(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling DefaultApi#nullableArrayTestGet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} + +``` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*DefaultApi* | [**nullableArrayTestGet**](docs/DefaultApi.md#nullableArrayTestGet) | **GET** /nullable-array-test | + + +## Documentation for Models + + - [ByteArrayObject](docs/ByteArrayObject.md) + + +## Documentation for Authorization + +All endpoints do not require authorization. +Authentication schemes defined for the API: + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. + +## Author + + + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml b/samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml new file mode 100644 index 00000000000..2619b457689 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml @@ -0,0 +1,49 @@ +openapi: 3.0.0 +info: + description: byte Array error in equal method + title: 'Minimal Example ' + version: v1 +servers: +- url: / +paths: + /nullable-array-test: + get: + parameters: [] + responses: + "200": + content: + application/json: + schema: + items: + $ref: '#/components/schemas/ByteArrayObject' + type: array + x-accepts: application/json +components: + schemas: + ByteArrayObject: + example: + nullableArray: nullableArray + nullableString: nullableString + normalArray: normalArray + stringField: stringField + intField: 0.8008281904610115 + properties: + nullableArray: + description: byte array. + format: byte + nullable: true + type: string + normalArray: + description: byte array. + format: byte + type: string + nullableString: + nullable: true + type: string + stringField: + type: string + intField: + format: int32 + type: number + type: object + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/build.gradle b/samples/client/petstore/java/webclient-nulable-arrays/build.gradle new file mode 100644 index 00000000000..343400c83c2 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/build.gradle @@ -0,0 +1,141 @@ +apply plugin: 'idea' +apply plugin: 'eclipse' + +group = 'org.openapitools' +version = 'v1' + +buildscript { + repositories { + maven { url "https://repo1.maven.org/maven2" } + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.+' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + } +} + +repositories { + maven { url "https://repo1.maven.org/maven2" } + jcenter() +} + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 25 + buildToolsVersion '25.0.2' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 25 + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + install { + repositories.mavenInstaller { + pom.artifactId = 'petstore-webclient-nullable-arrays' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } + + task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir + } + + artifacts { + archives sourcesJar + archives javadocJar + } +} + +ext { + swagger_annotations_version = "1.6.2" + spring_web_version = "2.4.3" + jackson_version = "2.11.3" + jackson_databind_version = "2.11.3" + jackson_databind_nullable_version = "0.2.1" + javax_annotation_version = "1.3.2" + reactor_version = "3.4.3" + reactor_netty_version = "0.7.15.RELEASE" + jodatime_version = "2.9.9" + junit_version = "4.13.1" +} + +dependencies { + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.projectreactor:reactor-core:$reactor_version" + implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_web_version" + implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + testImplementation "junit:junit:$junit_version" +} + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/build.sbt b/samples/client/petstore/java/webclient-nulable-arrays/build.sbt new file mode 100644 index 00000000000..464090415c4 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/build.sbt @@ -0,0 +1 @@ +# TODO diff --git a/samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md b/samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md new file mode 100644 index 00000000000..44cedf0bd5d --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md @@ -0,0 +1,17 @@ + + +# ByteArrayObject + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**nullableArray** | **byte[]** | byte array. | [optional] +**normalArray** | **byte[]** | byte array. | [optional] +**nullableString** | **String** | | [optional] +**stringField** | **String** | | [optional] +**intField** | **BigDecimal** | | [optional] + + + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md b/samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md new file mode 100644 index 00000000000..6b52ac1cfc9 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md @@ -0,0 +1,69 @@ +# DefaultApi + +All URIs are relative to *http://localhost* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**nullableArrayTestGet**](DefaultApi.md#nullableArrayTestGet) | **GET** /nullable-array-test | + + + +## nullableArrayTestGet + +> List<ByteArrayObject> nullableArrayTestGet() + + + +### Example + +```java +// Import classes: +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.DefaultApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + try { + List result = apiInstance.nullableArrayTestGet(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling DefaultApi#nullableArrayTestGet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +[**List<ByteArrayObject>**](ByteArrayObject.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | | - | + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/git_push.sh b/samples/client/petstore/java/webclient-nulable-arrays/git_push.sh new file mode 100644 index 00000000000..ced3be2b0c7 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/git_push.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=`git remote` +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties b/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties new file mode 100644 index 00000000000..05644f0754a --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties @@ -0,0 +1,2 @@ +# Uncomment to build for Android +#target = android \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gTVU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^ zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_ zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J| z0U$H!4S_TVjj<`6dy^2j`V`)mC;cB%* z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6M=%@fics4ajI;st# zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw| z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2 zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy z8R=obwO4dL%pmVo*Ktf=lH6hnlz_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)& z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u& zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9 zGaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2 zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO} zfaUwYm{XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=? zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyFe z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+ zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6 zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd_JNXH=>|`OH-CDCmcH(0%iD_aLlNHKH z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9 zGghsG3ekq#N||u{4We_25U=y#T*S{4I{++Ku)> zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y z%$q_wpb07EYPdmyH(1^09i$ca{O<}7) zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq# zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+-H77^$Lvi+#vmhL9J zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP? zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52? z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+ z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}ZyhqZ^!-=cyGP_ShV1rGxkx8t zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gSiCJmQMN&4%1D zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l>C|JK z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6 zifO#{VNz3)?ZL$be;NEaAk9b#{tV?V7 zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF zt?*Jr5NG+WadM{mDL>GyiByCuR)hd zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9 zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D zm(`AQ#k^DWrjbuXoJf2{Aj^KT zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP z)?aFzpDgnLYiERsKPu|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUOVHxB|{Ay~aOg5RN;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O z{091@v%Bd*3pk0^2UtiF9Z+(a@wy6 zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79 zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q zbz|7~CF(k_9~n|h;ysZ+jHzkXf(*O*@5m zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j ztJ||IfFG1lE9nmQ0+jPQy zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq z{#w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8! z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1 zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#v)s5vv3@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp zu^YJ0=lwsi`eP_pU8}6JA7MS;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~}GWRw!W5J3tNX*^2+1f3hz{~rIzJo z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE>0ga#WLsn9tY(&29zBvH1$`iWtTe zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4 z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV* zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+ zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y zl8@(5BlWYLt1yAWy?rMD&bwze8bC3-GfNH=p zynNFCdxyX?K&G(ZZ)afguQ2|r;XoV^=^(;Cku#qYn4Lus`UeKt6rAlFo_rU`|Rq z&G?~iWMBio<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil} zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76EEz?#W za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4UKkV9~P}>sq0?xD3vg+$4vLm~C(+ zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?1i+280CFsE|vIXQbm| zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^ z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`$nw#ndFk`tcpd5A=Idue`XZ!FS>Q zG^0w#>P4pPG+*NC9gLP4x2m=cKP}YuS!l^?sHSFftZy{4CoQrb_ z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287 zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK z;q~*m&}L<-cb+mDDXzvvrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~ z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_ z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t zDCsgIJ~0`af%YR%Ma5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7 zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+ zQ4|qzci=0}Jydw|LXLCrOl1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7 zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}{T(4DF0BOk-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH! z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@= zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N; z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s z4e*7gV2s=YxEvskw2Ju!2%{8h01rx-3`NCPc(O zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p z;}SV|oIK)iwlBs+`ROXkhd&NK zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AANSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b% zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34 z)rp$)Kr?R+KdJ;IO;pM{$6|2y=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06 zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J* zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@} zi1g~GqglxkZ5pEFkllJ)Ta1I^c&Bt6#r(QLQ02yHTaJB~- zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFYhu>3=_ zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf zcs7zH(I8Eui9UU4L--))yy`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW| zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^ zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4 z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}YHNzBk)ZIp} zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5 zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN< zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@ zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^ zte$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9 z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3I(qTQ^U$S>%$l z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK^2@L$R(r^-_+z?lOo+me-VW=Zw z-Bn>$4ovfWd%SPY`ab-u9{INc*k2h+yH%toDHIyqQ zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$ z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{ z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fHZu7AzHF(BQ!tyAz^L0`X z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC zAe^vCIJhajmm7C6g! zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV z$#`=BQ*jpCjm$F0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~ z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO zGHZKLN2L0D;ab%{_S1Plm|hx8R?O14*w*f&2&bB050n!R2by zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3- zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(t|Qjm{SalS~V-tX#+2ekRhwmN zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~ zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p zuQG~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$ zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY> zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8 z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX zJ_LdmM#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgThP*-Oeo`T0eq9 zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*BFM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn zR-0?J_LFg*?(#n~G8cXut(1nVF0Oka$A$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1 zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s zD!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV zOXt$}iP6(YJKc9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g( z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1 z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8 z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd zP87XfhnUHxCUHhM@b*NbTi#(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@TsO|Y8V=n@*!Rog7<7Cid%apR|x zOjhHCyfbIt%+*PCveTEcuiDi%Wx;O;+K=W?OFUV%)%~6;gl?<0%)?snDDqIvkHF{ zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3Wm5t1OIaqF^~><2?4e3c&)@wKn9bD? zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L; z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR zbVW(3`+(PQ2>TKY>N!jGmGo7oeoB8O|P_!Ic@ zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|& zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&WXIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae) zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+ zF}KIYx@pkccIgyxFm#LNw~G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9 zKV6fyr)TScJPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c zHl9E5DQI}Oz74n zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+pg?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4 zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04 z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d z&gkoUK{$!$$K`3*O-jyM1~p-7T*qb)Ys>Myt^;#1&a%O@x8A+E>! zY8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r* z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%( z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa&FRw}L(SoD z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6? z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE* zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8 zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H zkn>FKh)<9DwwS*|Y(q?$^N!6(51O0 z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6 zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt< zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08 z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i|&yU*@16l z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5oXL3@5**h(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+ zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0 zUOykwH=$LwX2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3 zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9 zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV z9g;M!3z~f_?P%y3-ph%vBMeS@p7P&Ea8M@97+%XEj*(1E6vHj==d zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk z!^?95S^C0ja^jwP`|{<+3cBVog$(mRdQmadS+Vh~z zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGfTq$nBTB!{SrWmL9Hs}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+ zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG| zze?srg|5Ti8Og{O zeFxuw9!U+zhyk?@w zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<21ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@ zgI0XKmP6MNzw>nRxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML} zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D zQ?o$z5u0^8`giv%qE!BzZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW) z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^bgJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4& zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM z#DfSXs_iWOMt)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#> zv=mLWe96%EY;!ZGSQDbZWb#;tzqAGgx~uk+-$+2_8U`!ypbwXl z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;-> ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS zN+^Un$tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_d=z{0dGS+pToEI6=Bo8+{k$7&Z zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^ zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd zvb*>&W)|u#F{Z_b`f#GVtQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT; zftVVlK2g@+1Ahv2$D){@Y#cL#dUj9*&%#6 zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3 zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~ zd>j#QQSBn3oaWd;qy$&5(5H$Ayi)0haAYO6TH>FR?rhqHmNOO+(})NB zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K zxBgsN0BjfB>UVcJ|x%=-zb%OV7lmZc& zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0 zD5c12B&A2&P6Ng~8WM2eIW=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5 zt>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5 zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@ zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<- z>2r~IApQGhstZ!3*?5V z8#)hJ0TdZg0M-BK#nGFP>$i=qk82DO z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q
Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuYG{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@ zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OWITeSGo6+-8Xw znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDWjqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6 zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNvauve~eX<+Ipl&04 zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?GbgPojmjmnln;cTqCt=ADbE zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5 zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b} zDa8+v0(Dgx0yRL@ZXOYIlVSZ0|MFizy0VPW8;AfA5|pe!#j zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMwu`(i@Z)diJp~U54*-miOchy7Z35eL>^M z4p<-aIxH4VUZgS783@H%M7P9hX>t{|RU7$n4T(brCG#h9e9p! z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk z)o;~k-%+0K0g+L`Wala!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-6uu zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG< z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*ULnEgzW_1gCICtAD^WpC`A z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4 zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U? z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk> zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_ z)>|J?>&6%nvHhZERBtjK+s4xnut*@>GAmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~ z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o z`y3sADe>U%suxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn- z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g* z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#- zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA zMCINqrh3Vq;s%3MC1YL`{WjIAPkVL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk| z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I zkqjq(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg zsX_e*$h?380O00ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e` zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y z)~Kzs#exIAaf--65L0UHT_SvV8O2WYeD>Mq^Y6L!Xu8%vnpofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-! zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g` z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@ zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>& z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-IXWK3^6QNU+2pe=MBn4I*R@A%-iLDCOHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ z0`_?KX0<-=o!t{u(Ln)v>%VGL z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(gQJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5 z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@ zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P z4fE$#%zkd=UzOB74gi=-*CuID&Z3zI^-`4U^S?dHxK8fP*;fE|a(KYMgMUo`THIS1f!*6dOI2 zFjC3O=-AL`6=9pp;`CYPTdVX z8(*?V&%QoipuH0>WKlL8A*zTKckD!paN@~hh zmXzm~qZhMGVdQGd=AG8&20HW0RGV8X{$9LldFZYm zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqcAoJh-AxEw$-bjW>`_+gEi z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YOj`CaEqTFag;$jY z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7` z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$ z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~ z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro

K7UpUK$>l@ zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=T+w91Cu^ z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^}Z;yriXsAf+Lp+OFLbR!&Ox?xABwl zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9 zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h#yi!AyDq1V(#V}^;{{V*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417 z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@ zkQj~v#V>xn)u??YutKsX>pxKCl^p!C-o?+9;!Nug^ z{rP!|+KsP5%uF;ZCa5F;O^9TGac=M|=V z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ z#~b?C4MoepT3X`qdW2dNn& zo8)K}%Lpu>0tQei+{>*VGErz|qjbK#9 zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4 z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR& z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep5Z;B z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$ z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_ zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuHK??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf zHXIPukLqbhs~-*oa^gqgvtpgTk_7GypwH><53riYYL*M=Q@F-yEPLqQ&1Sc zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn zB528d-wUBQzrrSSLq?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP&P41h$2i2;?N~RA30LV`BsUcj zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0Wuhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{ zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$ zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA; zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{ zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@ zN8T-_I|&@A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axRw>4;rM*UOpT#Eb9xU1IiWo@h?|5uP zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ z+sR!_9IZa5!>f&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi zAFa!Nsi3y37I5EK;0cqu|9MRj<^r&h1lF}u0KpKQD^5Y+LvFEwM zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7LBMk zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5 z|6=9soU4>E))tW$<#>F ziZ$6>KJf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9) z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5&m20Ll?OyfUYC3WRn{cgQ?^V~UAv+5 z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@ z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{jL<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE< zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp# zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6 zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t z&uvp*@c8#2*paD!ZMCi3;K{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)? z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{` z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h zeSeAI@E6Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t} zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV6pPtAI$)QN{!JRBKh-D zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{&26eXLn zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa% z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0sk}~es!{D>4r%PC*F~FN3owq5e0|YeUTSG#Vq%&Gk7uwW z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~ z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4` zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^ zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*}#_&}w*KEgtX)cU{vm9b$atHa;s>| z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}! zAX~t;3tb~VuP|ZW;z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzEf6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**VmZu7vnuufD7K~GIxfxbsQ@qv2T zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$ zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>> zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+ zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M} z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW? ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6 zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n# zas*?7LkxS-XSqv;YBa zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{ zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp7{VEuW*^IR2n$Fb99*nAtqT&oOFIf z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6 z1Q|(#UuP6pj78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF zPZQ_0AY*9M97>Jf<o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w` zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu zN<1i$siJhXFdjV zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq& zoruUh2(^3pe)2{bvt4&4Y9CY3js)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?kH-FEy82=O8`+szN ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6 zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4>#Uh-Bec z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH# zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7 z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9} zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B- zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm( zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY_$0`0jY-Kkt zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx zcF+cS`ommfKMhNSbas^@YbTpH1*RFrBuATUR zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs zB%KY|@wLcAA@)KXi!d2_BxrkhDn`DT1=Dec}V!okd{$+wK z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT zt%2B2iL_KU_ita%N>xjB!#71_3=3c}o zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s| zWv7Lu1=%WGk4FSw^;;!8&YPM)pQDCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V z8p|KXJPV$HyQr1A(9LVrM47u-XpcrIyO`yWvx1pVYc&?154aneRpLqgx)EMvRaa#|9?Wwqs2+W8n5~79G z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K| zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~ ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN zI8hhYKhQ)i z37^aP13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1 z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6 zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i zU^Eig`S2`{+gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc; z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8 z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#% zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_ zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#mexj+W(cz%9a4sx|IRG=}ia zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji zJHSL~s)YHBR=Koa1mLEOHos*`gp=s8KA-C zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5 z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l^-i}>e7v!qs_jv zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^> z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?< z?($L>(#BO*)^)rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v zFiSRY6rOc^(dgSV1>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!! zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?< zt5*^DV~6Zedbec4NVl($2T{&b)zA@b#dUyd>`2JC0=xa_fIm8{5um zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+ zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@ z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn zNJ7oz5*ReJukD55fUsMuaP+H4tDN&V9zfqF@ zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{GvXTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(ZrdsIPw&-=yHQ7_Vle|5h>AST0 zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8 zV3x4L4|qqu`B$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^ z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L-8G%+yEL zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3 zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ< z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9# z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp* zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+* zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S zcSftDU1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!#6?`T25mTu9OJp2L8z3! z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ| zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~} zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+ z+#4$066ISh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@ zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f< zZ34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8 zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<| zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2 z>6}Vkc zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9UdjyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyoZ>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b z8Kvmyz%bKQxpP}~baG-rwYcYCvkHOi zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z=ik z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R} z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE zGvWNpYX)Nv<8|a^;1>bh#&znEcl-r!T#pn= z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zRegMn78wuMs#;i&eUA0Zk_RXQ3b&TT} z;SCI=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_mDY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E zhY2dI8@+N^qrMI1+;TUda(vGqGSRyU{Fnm`aqrr7bz42c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X# zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*> zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7 zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$gwD$UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP- z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7 zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!& zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..4d9ca164914 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradlew b/samples/client/petstore/java/webclient-nulable-arrays/gradlew new file mode 100644 index 00000000000..4f906e0c811 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat b/samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/webclient-nulable-arrays/pom.xml b/samples/client/petstore/java/webclient-nulable-arrays/pom.xml new file mode 100644 index 00000000000..54c073f0f2e --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/pom.xml @@ -0,0 +1,138 @@ + + 4.0.0 + org.openapitools + petstore-webclient-nullable-arrays + jar + petstore-webclient-nullable-arrays + v1 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + + + + + Unlicense + http://unlicense.org + repo + + + + + + OpenAPI-Generator Contributors + team@openapitools.org + OpenAPITools.org + http://openapitools.org + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + + + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + + io.projectreactor + reactor-core + ${reactor-version} + + + + + org.springframework.boot + spring-boot-starter-webflux + ${spring-web-version} + + + + io.projectreactor.ipc + reactor-netty + ${reactor-netty-version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind-version} + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + javax.annotation + javax.annotation-api + ${javax-annotation-version} + provided + + + + + junit + junit + ${junit-version} + test + + + + UTF-8 + 1.6.2 + 2.4.3 + 2.11.3 + 2.11.3 + 0.2.1 + 1.3.2 + 4.13.1 + 3.4.3 + 0.7.15.RELEASE + + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/settings.gradle b/samples/client/petstore/java/webclient-nulable-arrays/settings.gradle new file mode 100644 index 00000000000..7e909db80d1 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "petstore-webclient-nullable-arrays" \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml b/samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..54fbcb3da1e --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java new file mode 100644 index 00000000000..87f4608c090 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java @@ -0,0 +1,720 @@ +package org.openapitools.client; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.InvalidMediaTypeException; +import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; +import org.springframework.http.RequestEntity.BodyBuilder; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.codec.json.Jackson2JsonDecoder; +import org.springframework.http.codec.json.Jackson2JsonEncoder; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.http.client.reactive.ClientHttpRequest; +import org.springframework.web.client.RestClientException; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.ClientResponse; +import org.springframework.web.reactive.function.BodyInserter; +import org.springframework.web.reactive.function.BodyInserters; +import org.springframework.web.reactive.function.client.ExchangeStrategies; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Flux; +import java.util.Optional; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Arrays; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; + +import javax.annotation.Nullable; + +import java.time.OffsetDateTime; + +import org.openapitools.client.auth.Authentication; +import org.openapitools.client.auth.HttpBasicAuth; +import org.openapitools.client.auth.HttpBearerAuth; +import org.openapitools.client.auth.ApiKeyAuth; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class ApiClient extends JavaTimeFormatter { + public enum CollectionFormat { + CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); + + private final String separator; + private CollectionFormat(String separator) { + this.separator = separator; + } + + private String collectionToString(Collection collection) { + return StringUtils.collectionToDelimitedString(collection, separator); + } + } + + private HttpHeaders defaultHeaders = new HttpHeaders(); + private MultiValueMap defaultCookies = new LinkedMultiValueMap(); + + private String basePath = "http://localhost"; + + private final WebClient webClient; + private final DateFormat dateFormat; + private final ObjectMapper objectMapper; + + private Map authentications; + + + public ApiClient() { + this.dateFormat = createDefaultDateFormat(); + this.objectMapper = createDefaultObjectMapper(this.dateFormat); + this.webClient = buildWebClient(this.objectMapper); + this.init(); + } + + public ApiClient(WebClient webClient) { + this(Optional.ofNullable(webClient).orElseGet(() -> buildWebClient()), createDefaultDateFormat()); + } + + public ApiClient(ObjectMapper mapper, DateFormat format) { + this(buildWebClient(mapper.copy()), format); + } + + public ApiClient(WebClient webClient, ObjectMapper mapper, DateFormat format) { + this(Optional.ofNullable(webClient).orElseGet(() -> buildWebClient(mapper.copy())), format); + } + + private ApiClient(WebClient webClient, DateFormat format) { + this.webClient = webClient; + this.dateFormat = format; + this.objectMapper = createDefaultObjectMapper(format); + this.init(); + } + + public static DateFormat createDefaultDateFormat() { + DateFormat dateFormat = new RFC3339DateFormat(); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + return dateFormat; + } + + public static ObjectMapper createDefaultObjectMapper(@Nullable DateFormat dateFormat) { + if (null == dateFormat) { + dateFormat = createDefaultDateFormat(); + } + ObjectMapper mapper = new ObjectMapper(); + mapper.setDateFormat(dateFormat); + mapper.registerModule(new JavaTimeModule()); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNullableModule jnm = new JsonNullableModule(); + mapper.registerModule(jnm); + return mapper; + } + + protected void init() { + // Setup authentications (key: authentication name, value: authentication). + authentications = new HashMap(); + // Prevent the authentications from being modified. + authentications = Collections.unmodifiableMap(authentications); + } + + /** + * Build the WebClientBuilder used to make WebClient. + * @param mapper ObjectMapper used for serialize/deserialize + * @return WebClient + */ + public static WebClient.Builder buildWebClientBuilder(ObjectMapper mapper) { + ExchangeStrategies strategies = ExchangeStrategies + .builder() + .codecs(clientDefaultCodecsConfigurer -> { + clientDefaultCodecsConfigurer.defaultCodecs().jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, MediaType.APPLICATION_JSON)); + clientDefaultCodecsConfigurer.defaultCodecs().jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MediaType.APPLICATION_JSON)); + }).build(); + WebClient.Builder webClientBuilder = WebClient.builder().exchangeStrategies(strategies); + return webClientBuilder; + } + + /** + * Build the WebClientBuilder used to make WebClient. + * @return WebClient + */ + public static WebClient.Builder buildWebClientBuilder() { + return buildWebClientBuilder(createDefaultObjectMapper(null)); + } + + /** + * Build the WebClient used to make HTTP requests. + * @param mapper ObjectMapper used for serialize/deserialize + * @return WebClient + */ + public static WebClient buildWebClient(ObjectMapper mapper) { + return buildWebClientBuilder(mapper).build(); + } + + /** + * Build the WebClient used to make HTTP requests. + * @return WebClient + */ + public static WebClient buildWebClient() { + return buildWebClientBuilder(createDefaultObjectMapper(null)).build(); + } + + /** + * Get the current base path + * @return String the base path + */ + public String getBasePath() { + return basePath; + } + + /** + * Set the base path, which should include the host + * @param basePath the base path + * @return ApiClient this client + */ + public ApiClient setBasePath(String basePath) { + this.basePath = basePath; + return this; + } + + /** + * Get authentications (key: authentication name, value: authentication). + * @return Map the currently configured authentication types + */ + public Map getAuthentications() { + return authentications; + } + + /** + * Get authentication for the given name. + * + * @param authName The authentication name + * @return The authentication, null if not found + */ + public Authentication getAuthentication(String authName) { + return authentications.get(authName); + } + + /** + * Helper method to set access token for the first Bearer authentication. + * @param bearerToken Bearer token + */ + public void setBearerToken(String bearerToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(bearerToken); + return; + } + } + throw new RuntimeException("No Bearer authentication configured!"); + } + + /** + * Helper method to set username for the first HTTP basic authentication. + * @param username the username + */ + public void setUsername(String username) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setUsername(username); + return; + } + } + throw new RuntimeException("No HTTP basic authentication configured!"); + } + + /** + * Helper method to set password for the first HTTP basic authentication. + * @param password the password + */ + public void setPassword(String password) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setPassword(password); + return; + } + } + throw new RuntimeException("No HTTP basic authentication configured!"); + } + + /** + * Helper method to set API key value for the first API key authentication. + * @param apiKey the API key + */ + public void setApiKey(String apiKey) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKey(apiKey); + return; + } + } + throw new RuntimeException("No API key authentication configured!"); + } + + /** + * Helper method to set API key prefix for the first API key authentication. + * @param apiKeyPrefix the API key prefix + */ + public void setApiKeyPrefix(String apiKeyPrefix) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix); + return; + } + } + throw new RuntimeException("No API key authentication configured!"); + } + + /** + * Set the User-Agent header's value (by adding to the default header map). + * @param userAgent the user agent string + * @return ApiClient this client + */ + public ApiClient setUserAgent(String userAgent) { + addDefaultHeader("User-Agent", userAgent); + return this; + } + + /** + * Add a default header. + * + * @param name The header's name + * @param value The header's value + * @return ApiClient this client + */ + public ApiClient addDefaultHeader(String name, String value) { + if (defaultHeaders.containsKey(name)) { + defaultHeaders.remove(name); + } + defaultHeaders.add(name, value); + return this; + } + + /** + * Add a default cookie. + * + * @param name The cookie's name + * @param value The cookie's value + * @return ApiClient this client + */ + public ApiClient addDefaultCookie(String name, String value) { + if (defaultCookies.containsKey(name)) { + defaultCookies.remove(name); + } + defaultCookies.add(name, value); + return this; + } + + /** + * Get the date format used to parse/format date parameters. + * @return DateFormat format + */ + public DateFormat getDateFormat() { + return dateFormat; + } + + /** + * Parse the given string into Date object. + */ + public Date parseDate(String str) { + try { + return dateFormat.parse(str); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given Date object into string. + */ + public String formatDate(Date date) { + return dateFormat.format(date); + } + + /** + * Get the ObjectMapper used to make HTTP requests. + * @return ObjectMapper objectMapper + */ + public ObjectMapper getObjectMapper() { + return objectMapper; + } + + /** + * Get the WebClient used to make HTTP requests. + * @return WebClient webClient + */ + public WebClient getWebClient() { + return webClient; + } + + /** + * Format the given parameter object into string. + * @param param the object to convert + * @return String the parameter represented as a String + */ + public String parameterToString(Object param) { + if (param == null) { + return ""; + } else if (param instanceof Date) { + return formatDate( (Date) param); + } else if (param instanceof OffsetDateTime) { + return formatOffsetDateTime((OffsetDateTime) param); + } else if (param instanceof Collection) { + StringBuilder b = new StringBuilder(); + for(Object o : (Collection) param) { + if(b.length() > 0) { + b.append(","); + } + b.append(String.valueOf(o)); + } + return b.toString(); + } else { + return String.valueOf(param); + } + } + + /** + * Converts a parameter to a {@link MultiValueMap} for use in REST requests + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMap(CollectionFormat collectionFormat, String name, Object value) { + final MultiValueMap params = new LinkedMultiValueMap(); + + if (name == null || name.isEmpty() || value == null) { + return params; + } + + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + Collection valueCollection = null; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + params.add(name, parameterToString(value)); + return params; + } + + if (valueCollection.isEmpty()){ + return params; + } + + if (collectionFormat.equals(CollectionFormat.MULTI)) { + for (Object item : valueCollection) { + params.add(name, parameterToString(item)); + } + return params; + } + + List values = new ArrayList(); + for(Object o : valueCollection) { + values.add(parameterToString(o)); + } + params.add(name, collectionFormat.collectionToString(values)); + + return params; + } + + /** + * Check if the given {@code String} is a JSON MIME. + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(String mediaType) { + // "* / *" is default to JSON + if ("*/*".equals(mediaType)) { + return true; + } + + try { + return isJsonMime(MediaType.parseMediaType(mediaType)); + } catch (InvalidMediaTypeException e) { + } + return false; + } + + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(MediaType mediaType) { + return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*\\+json[;]?\\s*$")); + } + + /** + * Check if the given {@code String} is a Problem JSON MIME (RFC-7807). + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents Problem JSON, false otherwise + */ + public boolean isProblemJsonMime(String mediaType) { + return "application/problem+json".equalsIgnoreCase(mediaType); + } + + /** + * Select the Accept header's value from the given accepts array: + * if JSON exists in the given array, use it; + * otherwise use all of them (joining into a string) + * + * @param accepts The accepts array to select from + * @return List The list of MediaTypes to use for the Accept header + */ + public List selectHeaderAccept(String[] accepts) { + if (accepts.length == 0) { + return null; + } + for (String accept : accepts) { + MediaType mediaType = MediaType.parseMediaType(accept); + if (isJsonMime(mediaType) && !isProblemJsonMime(accept)) { + return Collections.singletonList(mediaType); + } + } + return MediaType.parseMediaTypes(StringUtils.arrayToCommaDelimitedString(accepts)); + } + + /** + * Select the Content-Type header's value from the given array: + * if JSON exists in the given array, use it; + * otherwise use the first one of the array. + * + * @param contentTypes The Content-Type array to select from + * @return MediaType The Content-Type header to use. If the given array is empty, null will be returned. + */ + public MediaType selectHeaderContentType(String[] contentTypes) { + if (contentTypes.length == 0) { + return null; + } + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (isJsonMime(mediaType)) { + return mediaType; + } + } + return MediaType.parseMediaType(contentTypes[0]); + } + + /** + * Select the body to use for the request + * @param obj the body object + * @param formParams the form parameters + * @param contentType the content type of the request + * @return Object the selected body + */ + protected BodyInserter selectBody(Object obj, MultiValueMap formParams, MediaType contentType) { + if(MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) { + MultiValueMap map = new LinkedMultiValueMap<>(); + + formParams + .toSingleValueMap() + .entrySet() + .forEach(es -> map.add(es.getKey(), String.valueOf(es.getValue()))); + + return BodyInserters.fromFormData(map); + } else if(MediaType.MULTIPART_FORM_DATA.equals(contentType)) { + return BodyInserters.fromMultipartData(formParams); + } else { + return obj != null ? BodyInserters.fromValue(obj) : null; + } + } + + /** + * Invoke API by sending HTTP request with the given options. + * + * @param the return type to use + * @param path The sub-path of the HTTP URL + * @param method The request method + * @param pathParams The path parameters + * @param queryParams The query parameters + * @param body The request body object + * @param headerParams The header parameters + * @param formParams The form parameters + * @param accept The request's Accept header + * @param contentType The request's Content-Type header + * @param authNames The authentications to apply + * @param returnType The return type into which to deserialize the response + * @return The response body in chosen type + */ + public ResponseSpec invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { + final WebClient.RequestBodySpec requestBuilder = prepareRequest(path, method, pathParams, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames); + return requestBuilder.retrieve(); + } + + /** + * Include queryParams in uriParams taking into account the paramName + * @param queryParam The query parameters + * @param uriParams The path parameters + * return templatized query string + */ + private String generateQueryUri(MultiValueMap queryParams, Map uriParams) { + StringBuilder queryBuilder = new StringBuilder(); + queryParams.forEach((name, values) -> { + if (CollectionUtils.isEmpty(values)) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + } else { + int valueItemCounter = 0; + for (Object value : values) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + if (value != null) { + String templatizedKey = name + valueItemCounter++; + uriParams.put(templatizedKey, value.toString()); + queryBuilder.append('=').append("{").append(templatizedKey).append("}"); + } + } + } + }); + return queryBuilder.toString(); + } + + private WebClient.RequestBodySpec prepareRequest(String path, HttpMethod method, Map pathParams, + MultiValueMap queryParams, Object body, HttpHeaders headerParams, + MultiValueMap cookieParams, MultiValueMap formParams, List accept, + MediaType contentType, String[] authNames) { + updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); + + final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); + + String finalUri = builder.build(false).toUriString(); + Map uriParams = new HashMap(); + uriParams.putAll(pathParams); + + if (queryParams != null && !queryParams.isEmpty()) { + //Include queryParams in uriParams taking into account the paramName + String queryUri = generateQueryUri(queryParams, uriParams); + //Append to finalUri the templatized query string like "?param1={param1Value}&....... + finalUri += "?" + queryUri; + } + + final WebClient.RequestBodySpec requestBuilder = webClient.method(method).uri(finalUri, uriParams); + + if (accept != null) { + requestBuilder.accept(accept.toArray(new MediaType[accept.size()])); + } + if(contentType != null) { + requestBuilder.contentType(contentType); + } + + addHeadersToRequest(headerParams, requestBuilder); + addHeadersToRequest(defaultHeaders, requestBuilder); + addCookiesToRequest(cookieParams, requestBuilder); + addCookiesToRequest(defaultCookies, requestBuilder); + + requestBuilder.body(selectBody(body, formParams, contentType)); + return requestBuilder; + } + + /** + * Add headers to the request that is being built + * @param headers The headers to add + * @param requestBuilder The current request + */ + protected void addHeadersToRequest(HttpHeaders headers, WebClient.RequestBodySpec requestBuilder) { + for (Entry> entry : headers.entrySet()) { + List values = entry.getValue(); + for(String value : values) { + if (value != null) { + requestBuilder.header(entry.getKey(), value); + } + } + } + } + + /** + * Add cookies to the request that is being built + * @param cookies The cookies to add + * @param requestBuilder The current request + */ + protected void addCookiesToRequest(MultiValueMap cookies, WebClient.RequestBodySpec requestBuilder) { + for (Entry> entry : cookies.entrySet()) { + List values = entry.getValue(); + for(String value : values) { + if (value != null) { + requestBuilder.cookie(entry.getKey(), value); + } + } + } + } + + /** + * Update query and header parameters based on authentication settings. + * + * @param authNames The authentications to apply + * @param queryParams The query parameters + * @param headerParams The header parameters + * @param cookieParams the cookie parameters + */ + private void updateParamsForAuth(String[] authNames, MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + for (String authName : authNames) { + Authentication auth = authentications.get(authName); + if (auth == null) { + throw new RestClientException("Authentication undefined: " + authName); + } + auth.applyToParams(queryParams, headerParams, cookieParams); + } + } + + /** + * Formats the specified collection path parameter to a string value. + * + * @param collectionFormat The collection format of the parameter. + * @param values The values of the parameter. + * @return String representation of the parameter + */ + public String collectionPathParameterToString(CollectionFormat collectionFormat, Collection values) { + // create the value based on the collection format + if (CollectionFormat.MULTI.equals(collectionFormat)) { + // not valid for path params + return parameterToString(values); + } + + // collectionFormat is assumed to be "csv" by default + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + return collectionFormat.collectionToString(values); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java new file mode 100644 index 00000000000..9e5bee7fcce --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java @@ -0,0 +1,64 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +/** + * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. + * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class JavaTimeFormatter { + + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } + + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } + + /** + * Parse the given string into {@code OffsetDateTime} object. + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); + } + } + /** + * Format the given {@code OffsetDateTime} object into string. + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java new file mode 100644 index 00000000000..e8c4b6e227a --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java @@ -0,0 +1,55 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + } + + @Override + public Date parse(String source) { + return parse(source, new ParsePosition(0)); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return this; + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java new file mode 100644 index 00000000000..a1107a8690e --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java @@ -0,0 +1,58 @@ +package org.openapitools.client; + +import java.util.Map; + +/** + * Representing a Server configuration. + */ +public class ServerConfiguration { + public String URL; + public String description; + public Map variables; + + /** + * @param URL A URL to the target host. + * @param description A describtion of the host designated by the URL. + * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template. + */ + public ServerConfiguration(String URL, String description, Map variables) { + this.URL = URL; + this.description = description; + this.variables = variables; + } + + /** + * Format URL template using given variables. + * + * @param variables A map between a variable name and its value. + * @return Formatted URL. + */ + public String URL(Map variables) { + String url = this.URL; + + // go through variables and replace placeholders + for (Map.Entry variable: this.variables.entrySet()) { + String name = variable.getKey(); + ServerVariable serverVariable = variable.getValue(); + String value = serverVariable.defaultValue; + + if (variables != null && variables.containsKey(name)) { + value = variables.get(name); + if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) { + throw new RuntimeException("The variable " + name + " in the server URL has invalid value " + value + "."); + } + } + url = url.replaceAll("\\{" + name + "\\}", value); + } + return url; + } + + /** + * Format URL template using default server variables. + * + * @return Formatted URL. + */ + public String URL() { + return URL(null); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java new file mode 100644 index 00000000000..c2f13e21666 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java @@ -0,0 +1,23 @@ +package org.openapitools.client; + +import java.util.HashSet; + +/** + * Representing a Server Variable for server URL template substitution. + */ +public class ServerVariable { + public String description; + public String defaultValue; + public HashSet enumValues = null; + + /** + * @param description A description for the server variable. + * @param defaultValue The default value to use for substitution. + * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set. + */ + public ServerVariable(String description, String defaultValue, HashSet enumValues) { + this.description = description; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java new file mode 100644 index 00000000000..93f5432910d --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java @@ -0,0 +1,83 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Collection; +import java.util.Iterator; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) { + return true; + } + if (value != null && value.equalsIgnoreCase(str)) { + return true; + } + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

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

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) { + return ""; + } + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } + + /** + * Join a list of strings with the given separator. + * + * @param list The list of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(Collection list, String separator) { + Iterator iterator = list.iterator(); + StringBuilder out = new StringBuilder(); + if (iterator.hasNext()) { + out.append(iterator.next()); + } + while (iterator.hasNext()) { + out.append(separator).append(iterator.next()); + } + return out.toString(); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java new file mode 100644 index 00000000000..6e17adf4454 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -0,0 +1,96 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; + +import org.openapitools.client.model.ByteArrayObject; + +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.WebClientResponseException; +import org.springframework.core.io.FileSystemResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Flux; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DefaultApi { + private ApiClient apiClient; + + public DefaultApi() { + this(new ApiClient()); + } + + @Autowired + public DefaultApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * + * + *

200 + * @return List<ByteArrayObject> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec nullableArrayTestGetRequestCreation() throws WebClientResponseException { + Object postBody = null; + // create path and map variables + final Map pathParams = new HashMap(); + + final MultiValueMap queryParams = new LinkedMultiValueMap(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap(); + final MultiValueMap formParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { + "application/json" + }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * + * + *

200 + * @return List<ByteArrayObject> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Flux nullableArrayTestGet() throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return nullableArrayTestGetRequestCreation().bodyToFlux(localVarReturnType); + } + + public Mono>> nullableArrayTestGetWithHttpInfo() throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return nullableArrayTestGetRequestCreation().toEntityList(localVarReturnType); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java new file mode 100644 index 00000000000..9e9f3733160 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -0,0 +1,62 @@ +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class ApiKeyAuth implements Authentication { + private final String location; + private final String paramName; + + private String apiKey; + private String apiKeyPrefix; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKeyPrefix() { + return apiKeyPrefix; + } + + public void setApiKeyPrefix(String apiKeyPrefix) { + this.apiKeyPrefix = apiKeyPrefix; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (apiKey == null) { + return; + } + String value; + if (apiKeyPrefix != null) { + value = apiKeyPrefix + " " + apiKey; + } else { + value = apiKey; + } + if (location.equals("query")) { + queryParams.add(paramName, value); + } else if (location.equals("header")) { + headerParams.add(paramName, value); + } else if (location.equals("cookie")) { + cookieParams.add(paramName, value); + } + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java new file mode 100644 index 00000000000..4f9a14ebd7c --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java @@ -0,0 +1,14 @@ +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +public interface Authentication { + /** + * Apply authentication settings to header and / or query parameters. + * @param queryParams The query parameters for the request + * @param headerParams The header parameters for the request + * @param cookieParams The cookie parameters for the request + */ + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams); +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java new file mode 100644 index 00000000000..bbbbba67a47 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -0,0 +1,39 @@ +package org.openapitools.client.auth; + +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.Base64Utils; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java new file mode 100644 index 00000000000..775bbf64c3b --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java @@ -0,0 +1,39 @@ +package org.openapitools.client.auth; + +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.Base64Utils; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class HttpBearerAuth implements Authentication { + private final String scheme; + private String bearerToken; + + public HttpBearerAuth(String scheme) { + this.scheme = scheme; + } + + public String getBearerToken() { + return bearerToken; + } + + public void setBearerToken(String bearerToken) { + this.bearerToken = bearerToken; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (bearerToken == null) { + return; + } + headerParams.add(HttpHeaders.AUTHORIZATION, (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + } + + private static String upperCaseBearer(String scheme) { + return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + } + +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java new file mode 100644 index 00000000000..0f1960813ae --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java @@ -0,0 +1,271 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import org.openapitools.jackson.nullable.JsonNullable; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +/** + * ByteArrayObject + */ +@JsonPropertyOrder({ + ByteArrayObject.JSON_PROPERTY_NULLABLE_ARRAY, + ByteArrayObject.JSON_PROPERTY_NORMAL_ARRAY, + ByteArrayObject.JSON_PROPERTY_NULLABLE_STRING, + ByteArrayObject.JSON_PROPERTY_STRING_FIELD, + ByteArrayObject.JSON_PROPERTY_INT_FIELD +}) +@JsonTypeName("ByteArrayObject") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class ByteArrayObject { + public static final String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; + private JsonNullable nullableArray = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_NORMAL_ARRAY = "normalArray"; + private byte[] normalArray; + + public static final String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; + private JsonNullable nullableString = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_STRING_FIELD = "stringField"; + private String stringField; + + public static final String JSON_PROPERTY_INT_FIELD = "intField"; + private BigDecimal intField; + + + public ByteArrayObject nullableArray(byte[] nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + + return this; + } + + /** + * byte array. + * @return nullableArray + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "byte array.") + @JsonIgnore + + public byte[] getNullableArray() { + return nullableArray.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableArray_JsonNullable() { + return nullableArray; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + public void setNullableArray_JsonNullable(JsonNullable nullableArray) { + this.nullableArray = nullableArray; + } + + public void setNullableArray(byte[] nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + } + + + public ByteArrayObject normalArray(byte[] normalArray) { + + this.normalArray = normalArray; + return this; + } + + /** + * byte array. + * @return normalArray + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "byte array.") + @JsonProperty(JSON_PROPERTY_NORMAL_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public byte[] getNormalArray() { + return normalArray; + } + + + @JsonProperty(JSON_PROPERTY_NORMAL_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNormalArray(byte[] normalArray) { + this.normalArray = normalArray; + } + + + public ByteArrayObject nullableString(String nullableString) { + this.nullableString = JsonNullable.of(nullableString); + + return this; + } + + /** + * Get nullableString + * @return nullableString + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + @JsonIgnore + + public String getNullableString() { + return nullableString.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableString_JsonNullable() { + return nullableString; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + public void setNullableString_JsonNullable(JsonNullable nullableString) { + this.nullableString = nullableString; + } + + public void setNullableString(String nullableString) { + this.nullableString = JsonNullable.of(nullableString); + } + + + public ByteArrayObject stringField(String stringField) { + + this.stringField = stringField; + return this; + } + + /** + * Get stringField + * @return stringField + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_STRING_FIELD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getStringField() { + return stringField; + } + + + @JsonProperty(JSON_PROPERTY_STRING_FIELD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setStringField(String stringField) { + this.stringField = stringField; + } + + + public ByteArrayObject intField(BigDecimal intField) { + + this.intField = intField; + return this; + } + + /** + * Get intField + * @return intField + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_INT_FIELD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public BigDecimal getIntField() { + return intField; + } + + + @JsonProperty(JSON_PROPERTY_INT_FIELD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIntField(BigDecimal intField) { + this.intField = intField; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ByteArrayObject byteArrayObject = (ByteArrayObject) o; + return equalsNullable(this.nullableArray, byteArrayObject.nullableArray) && + Arrays.equals(this.normalArray, byteArrayObject.normalArray) && + equalsNullable(this.nullableString, byteArrayObject.nullableString) && + Objects.equals(this.stringField, byteArrayObject.stringField) && + Objects.equals(this.intField, byteArrayObject.intField); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), Arrays.hashCode(normalArray), hashCodeNullable(nullableString), stringField, intField); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ByteArrayObject {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" normalArray: ").append(toIndentedString(normalArray)).append("\n"); + sb.append(" nullableString: ").append(toIndentedString(nullableString)).append("\n"); + sb.append(" stringField: ").append(toIndentedString(stringField)).append("\n"); + sb.append(" intField: ").append(toIndentedString(intField)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java new file mode 100644 index 00000000000..6c15be4ff81 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -0,0 +1,47 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.model.ByteArrayObject; +import org.junit.Test; +import org.junit.Ignore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for DefaultApi + */ +@Ignore +public class DefaultApiTest { + + private final DefaultApi api = new DefaultApi(); + + + /** + * + * + * + */ + @Test + public void nullableArrayTestGetTest() { + List response = api.nullableArrayTestGet().collectList().block(); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java b/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java new file mode 100644 index 00000000000..aff761e19e6 --- /dev/null +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java @@ -0,0 +1,61 @@ +/* + * Minimal Example + * byte Array error in equal method + * + * The version of the OpenAPI document: v1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for ByteArrayObject + */ +public class ByteArrayObjectTest { + private final ByteArrayObject model = new ByteArrayObject(); + + /** + * Model tests for ByteArrayObject + */ + @Test + public void testByteArrayObject() { + // TODO: test ByteArrayObject + } + + /** + * Test the property 'nullableArray' + */ + @Test + public void nullableArrayTest() { + // TODO: test nullableArray + } + + /** + * Test the property 'normalArray' + */ + @Test + public void normalArrayTest() { + // TODO: test normalArray + } + +} diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java index c9e35dd1b5e..a2bc31cdab7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -26,6 +26,7 @@ import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.OuterEnumDefaultValue; import org.openapitools.client.model.OuterEnumInteger; import org.openapitools.client.model.OuterEnumIntegerDefaultValue; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -453,15 +454,28 @@ public class EnumTest { Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum) && + equalsNullable(this.outerEnum, enumTest.outerEnum) && Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) && Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) && Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java index fca0af36793..9ca1ed06b50 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -85,12 +86,25 @@ public class HealthCheckResult { return false; } HealthCheckResult healthCheckResult = (HealthCheckResult) o; - return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage); + return equalsNullable(this.nullableMessage, healthCheckResult.nullableMessage); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(nullableMessage); + return Objects.hash(hashCodeNullable(nullableMessage)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java index 303ba0aeb76..fee8d1fa00e 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -568,24 +569,37 @@ public class NullableClass extends HashMap { return false; } NullableClass nullableClass = (NullableClass) o; - return Objects.equals(this.integerProp, nullableClass.integerProp) && - Objects.equals(this.numberProp, nullableClass.numberProp) && - Objects.equals(this.booleanProp, nullableClass.booleanProp) && - Objects.equals(this.stringProp, nullableClass.stringProp) && - Objects.equals(this.dateProp, nullableClass.dateProp) && - Objects.equals(this.datetimeProp, nullableClass.datetimeProp) && - Objects.equals(this.arrayNullableProp, nullableClass.arrayNullableProp) && - Objects.equals(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && + return equalsNullable(this.integerProp, nullableClass.integerProp) && + equalsNullable(this.numberProp, nullableClass.numberProp) && + equalsNullable(this.booleanProp, nullableClass.booleanProp) && + equalsNullable(this.stringProp, nullableClass.stringProp) && + equalsNullable(this.dateProp, nullableClass.dateProp) && + equalsNullable(this.datetimeProp, nullableClass.datetimeProp) && + equalsNullable(this.arrayNullableProp, nullableClass.arrayNullableProp) && + equalsNullable(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) && - Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) && - Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && + equalsNullable(this.objectNullableProp, nullableClass.objectNullableProp) && + equalsNullable(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable) && super.equals(o); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode()); + return Objects.hash(hashCodeNullable(integerProp), hashCodeNullable(numberProp), hashCodeNullable(booleanProp), hashCodeNullable(stringProp), hashCodeNullable(dateProp), hashCodeNullable(datetimeProp), hashCodeNullable(arrayNullableProp), hashCodeNullable(arrayAndItemsNullableProp), arrayItemsNullable, hashCodeNullable(objectNullableProp), hashCodeNullable(objectAndItemsNullableProp), objectItemsNullable, super.hashCode()); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 5742109fbf2..bc5318f3f9e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -27,6 +27,7 @@ import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -336,7 +337,7 @@ public class AdditionalPropertiesClass { AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) && Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty) && - Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + equalsNullable(this.anytype1, additionalPropertiesClass.anytype1) && Objects.equals(this.mapWithUndeclaredPropertiesAnytype1, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype1) && Objects.equals(this.mapWithUndeclaredPropertiesAnytype2, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype2) && Objects.equals(this.mapWithUndeclaredPropertiesAnytype3, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype3) && @@ -344,9 +345,22 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapWithUndeclaredPropertiesString, additionalPropertiesClass.mapWithUndeclaredPropertiesString); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString); + return Objects.hash(mapProperty, mapOfMapProperty, hashCodeNullable(anytype1), mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java index d0f7d455d57..eb2ce538d97 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java @@ -34,6 +34,7 @@ import org.openapitools.client.model.Fruit; import org.openapitools.client.model.NullableShape; import org.openapitools.client.model.Shape; import org.openapitools.client.model.ShapeOrNull; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -236,14 +237,27 @@ public class Drawing { Drawing drawing = (Drawing) o; return Objects.equals(this.mainShape, drawing.mainShape) && Objects.equals(this.shapeOrNull, drawing.shapeOrNull) && - Objects.equals(this.nullableShape, drawing.nullableShape) && + equalsNullable(this.nullableShape, drawing.nullableShape) && Objects.equals(this.shapes, drawing.shapes)&& Objects.equals(this.additionalProperties, drawing.additionalProperties); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mainShape, shapeOrNull, nullableShape, shapes, additionalProperties); + return Objects.hash(mainShape, shapeOrNull, hashCodeNullable(nullableShape), shapes, additionalProperties); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java index 4c34c78d7a0..7304f015f29 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java @@ -28,6 +28,7 @@ import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.OuterEnumDefaultValue; import org.openapitools.client.model.OuterEnumInteger; import org.openapitools.client.model.OuterEnumIntegerDefaultValue; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -517,15 +518,28 @@ public class EnumTest { Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(this.enumIntegerOnly, enumTest.enumIntegerOnly) && Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum) && + equalsNullable(this.outerEnum, enumTest.outerEnum) && Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) && Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) && Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + return Objects.hash(enumString, enumStringRequired, enumInteger, enumIntegerOnly, enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java index 3e67cd1c84c..71a5e8e2c9f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -90,12 +91,25 @@ public class HealthCheckResult { return false; } HealthCheckResult healthCheckResult = (HealthCheckResult) o; - return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage); + return equalsNullable(this.nullableMessage, healthCheckResult.nullableMessage); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(nullableMessage); + return Objects.hash(hashCodeNullable(nullableMessage)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java index 2ee8e3a9954..2163e1535b8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java @@ -35,6 +35,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -603,24 +604,37 @@ public class NullableClass { return false; } NullableClass nullableClass = (NullableClass) o; - return Objects.equals(this.integerProp, nullableClass.integerProp) && - Objects.equals(this.numberProp, nullableClass.numberProp) && - Objects.equals(this.booleanProp, nullableClass.booleanProp) && - Objects.equals(this.stringProp, nullableClass.stringProp) && - Objects.equals(this.dateProp, nullableClass.dateProp) && - Objects.equals(this.datetimeProp, nullableClass.datetimeProp) && - Objects.equals(this.arrayNullableProp, nullableClass.arrayNullableProp) && - Objects.equals(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && + return equalsNullable(this.integerProp, nullableClass.integerProp) && + equalsNullable(this.numberProp, nullableClass.numberProp) && + equalsNullable(this.booleanProp, nullableClass.booleanProp) && + equalsNullable(this.stringProp, nullableClass.stringProp) && + equalsNullable(this.dateProp, nullableClass.dateProp) && + equalsNullable(this.datetimeProp, nullableClass.datetimeProp) && + equalsNullable(this.arrayNullableProp, nullableClass.arrayNullableProp) && + equalsNullable(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) && - Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) && - Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && + equalsNullable(this.objectNullableProp, nullableClass.objectNullableProp) && + equalsNullable(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable)&& Objects.equals(this.additionalProperties, nullableClass.additionalProperties); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, additionalProperties); + return Objects.hash(hashCodeNullable(integerProp), hashCodeNullable(numberProp), hashCodeNullable(booleanProp), hashCodeNullable(stringProp), hashCodeNullable(dateProp), hashCodeNullable(datetimeProp), hashCodeNullable(arrayNullableProp), hashCodeNullable(arrayAndItemsNullableProp), arrayItemsNullable, hashCodeNullable(objectNullableProp), hashCodeNullable(objectAndItemsNullableProp), objectItemsNullable, additionalProperties); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java index 0c27f6fba98..3644c760842 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; @@ -444,14 +445,27 @@ public class User { Objects.equals(this.phone, user.phone) && Objects.equals(this.userStatus, user.userStatus) && Objects.equals(this.objectWithNoDeclaredProps, user.objectWithNoDeclaredProps) && - Objects.equals(this.objectWithNoDeclaredPropsNullable, user.objectWithNoDeclaredPropsNullable) && - Objects.equals(this.anyTypeProp, user.anyTypeProp) && - Objects.equals(this.anyTypePropNullable, user.anyTypePropNullable); + equalsNullable(this.objectWithNoDeclaredPropsNullable, user.objectWithNoDeclaredPropsNullable) && + equalsNullable(this.anyTypeProp, user.anyTypeProp) && + equalsNullable(this.anyTypePropNullable, user.anyTypePropNullable); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && a.get().getClass().isArray() ? Arrays.equals((T[])a.get(), (T[])b.get()) : Objects.equals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable); + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, hashCodeNullable(objectWithNoDeclaredPropsNullable), hashCodeNullable(anyTypeProp), hashCodeNullable(anyTypePropNullable)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() + ? (a.get().getClass().isArray() ? Arrays.hashCode((T[])a.get()) : Objects.hashCode(a.get())) + : 31; } @Override From 68d48ea03af98a3d04388597787472ffd079b97e Mon Sep 17 00:00:00 2001 From: unintended Date: Tue, 27 Jul 2021 09:13:24 +0300 Subject: [PATCH 03/72] Store uri template attribute for webclient to store in metrics (#9964) * store URI template attribute for webclient * generate samples --- .../resources/Java/libraries/webclient/ApiClient.mustache | 4 ++++ .../src/main/resources/Java/libraries/webclient/api.mustache | 1 - .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++++ .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 - .../src/main/java/org/openapitools/client/api/FakeApi.java | 1 - .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 - .../src/main/java/org/openapitools/client/api/PetApi.java | 1 - .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 - .../src/main/java/org/openapitools/client/api/UserApi.java | 1 - 9 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache index 28b91d3a1f8..cabd6408abc 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache @@ -96,6 +96,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { } } + private static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate"; + private HttpHeaders defaultHeaders = new HttpHeaders(); private MultiValueMap defaultCookies = new LinkedMultiValueMap(); @@ -676,6 +678,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { addCookiesToRequest(cookieParams, requestBuilder); addCookiesToRequest(defaultCookies, requestBuilder); + requestBuilder.attribute(URI_TEMPLATE_ATTRIBUTE, path); + requestBuilder.body(selectBody(body, formParams, contentType)); return requestBuilder; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache index 28dbea910c0..2f79b929315 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java index 03a403f8a5d..74e87d2c7b3 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java @@ -85,6 +85,8 @@ public class ApiClient extends JavaTimeFormatter { } } + private static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate"; + private HttpHeaders defaultHeaders = new HttpHeaders(); private MultiValueMap defaultCookies = new LinkedMultiValueMap(); @@ -663,6 +665,8 @@ public class ApiClient extends JavaTimeFormatter { addCookiesToRequest(cookieParams, requestBuilder); addCookiesToRequest(defaultCookies, requestBuilder); + requestBuilder.attribute(URI_TEMPLATE_ATTRIBUTE, path); + requestBuilder.body(selectBody(body, formParams, contentType)); return requestBuilder; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index d34a72c745f..3974c464928 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index d9470a90523..215fa08c512 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -23,7 +23,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 5ed2845a1d6..0ce3faa72fa 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index 131b46af1d5..2c41cb36d90 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java index 0b768286c74..96a429311f9 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java index 94b291727f2..6920c4cd200 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; From fcdc9d49f7e14dbdae3f35c2c67341f7f2ff5305 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 27 Jul 2021 14:16:55 +0800 Subject: [PATCH 04/72] update samples --- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++++ .../src/main/java/org/openapitools/client/api/DefaultApi.java | 1 - .../src/main/java/org/openapitools/client/api/DefaultApi.java | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java index 87f4608c090..8cdcbac35cb 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java @@ -84,6 +84,8 @@ public class ApiClient extends JavaTimeFormatter { } } + private static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate"; + private HttpHeaders defaultHeaders = new HttpHeaders(); private MultiValueMap defaultCookies = new LinkedMultiValueMap(); @@ -642,6 +644,8 @@ public class ApiClient extends JavaTimeFormatter { addCookiesToRequest(cookieParams, requestBuilder); addCookiesToRequest(defaultCookies, requestBuilder); + requestBuilder.attribute(URI_TEMPLATE_ATTRIBUTE, path); + requestBuilder.body(selectBody(body, formParams, contentType)); return requestBuilder; } diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java index 6e17adf4454..9fd56d41cf3 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java index 3e540e25dd3..8bb798ec071 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.util.UriComponentsBuilder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; import org.springframework.web.reactive.function.client.WebClientResponseException; From b1cc7445a005bd6407bbca034c8957097ea52e04 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Tue, 27 Jul 2021 09:27:47 +0300 Subject: [PATCH 05/72] [Java][Spring] fix Spring RequestMapping (#9900) --- .../main/resources/JavaSpring/api.mustache | 3 +- .../main/resources/java-pkmst/api.mustache | 3 +- .../main/resources/kotlin-spring/api.mustache | 3 +- .../kotlin-spring/apiInterface.mustache | 3 +- .../2_0/petstore-with-spring-pageable.yaml | 9 ++++ .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 39 ++++++++++++---- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../kotlin/org/openapitools/api/PetApi.kt | 24 ++++++---- .../kotlin/org/openapitools/api/StoreApi.kt | 12 +++-- .../kotlin/org/openapitools/api/UserApi.kt | 24 ++++++---- .../kotlin/org/openapitools/api/PetApi.kt | 24 ++++++---- .../kotlin/org/openapitools/api/StoreApi.kt | 12 +++-- .../kotlin/org/openapitools/api/UserApi.kt | 24 ++++++---- .../kotlin/org/openapitools/api/PetApi.kt | 24 ++++++---- .../kotlin/org/openapitools/api/StoreApi.kt | 12 +++-- .../kotlin/org/openapitools/api/UserApi.kt | 24 ++++++---- .../org/openapitools/api/TestHeadersApi.java | 3 +- .../openapitools/api/TestQueryParamsApi.java | 3 +- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- .../virtualan/api/AnotherFakeApi.java | 3 +- .../openapitools/virtualan/api/FakeApi.java | 45 ++++++++++++------- .../virtualan/api/FakeClassnameTestApi.java | 3 +- .../openapitools/virtualan/api/PetApi.java | 24 ++++++---- .../openapitools/virtualan/api/StoreApi.java | 12 +++-- .../openapitools/virtualan/api/UserApi.java | 24 ++++++---- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++++++++------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 ++++++---- .../java/org/openapitools/api/StoreApi.java | 12 +++-- .../java/org/openapitools/api/UserApi.java | 24 ++++++---- 139 files changed, 1688 insertions(+), 832 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index 770bfd30183..d8b38705778 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -120,7 +120,8 @@ public interface {{classname}} { {{/headerParams}} }) {{/implicitHeaders}} - @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping( + @RequestMapping( + method = RequestMethod.{{httpMethod}}, value = "{{{path}}}"{{#singleContentTypes}}{{#hasProduces}}, produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}}, consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache index 49a986b1c3b..f2abfbf4119 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache @@ -55,7 +55,8 @@ public interface {{classname}} { {{#headerParams}}{{>implicitHeader}}{{/headerParams}} }) {{/implicitHeaders}} - @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping( + @RequestMapping( + method = RequestMethod.{{httpMethod}}, value = "{{{path}}}"{{#singleContentTypes}}, produces = "{{{vendorExtensions.x-accepts}}}", consumes = "{{{vendorExtensions.x-contentType}}}"{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 4faa920013c..7eceb8f43aa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -63,7 +63,8 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}) @ApiResponses( value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swaggerAnnotations}} - @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping( + @RequestMapping( + method = [RequestMethod.{{httpMethod}}], value = ["{{#lambda.escapeDoubleQuote}}{{path}}{{/lambda.escapeDoubleQuote}}"]{{#singleContentTypes}}{{#hasProduces}}, produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}}, consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 5e9b3888c8d..3a2ea440bd1 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -71,7 +71,8 @@ interface {{classname}} { authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}) @ApiResponses( value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swaggerAnnotations}} - @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping( + @RequestMapping( + method = [RequestMethod.{{httpMethod}}], value = ["{{#lambda.escapeDoubleQuote}}{{path}}{{/lambda.escapeDoubleQuote}}"]{{#singleContentTypes}}{{#hasProduces}}, produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}}, consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml index 83b998dc15e..a0cb3d27d2f 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml @@ -481,6 +481,15 @@ paths: responses: default: description: successful operation + options: + tags: + - user + summary: logoutUserOptions + description: '' + operationId: logoutUserOptions + responses: + default: + description: endpoint configuration response '/user/{username}': get: tags: diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index f0942e6db7d..a1cba950c2e 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -41,7 +41,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = "application/json" ) @@ -62,7 +63,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) CompletableFuture> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -84,7 +86,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = "application/json" ) @@ -108,7 +111,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = "application/json" ) @@ -132,7 +136,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = "application/json" ) @@ -156,7 +161,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = "application/json" ) @@ -178,7 +184,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = "application/x-www-form-urlencoded" ) @@ -200,7 +207,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = "application/json", consumes = "multipart/form-data" diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 4bae8225606..6ac6aa0dd6d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -40,7 +40,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{orderId}" ) CompletableFuture> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId); @@ -58,7 +59,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = "application/json" ) @@ -79,7 +81,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{orderId}", produces = "application/json" ) @@ -97,7 +100,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = "application/json" ) diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index d796bc41a17..d23f7860b46 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -38,7 +38,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) CompletableFuture> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -53,7 +54,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) CompletableFuture> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -68,7 +70,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) CompletableFuture> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -86,7 +89,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) CompletableFuture> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -105,7 +109,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = "application/json" ) @@ -124,7 +129,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = "application/json" ) @@ -139,7 +145,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) CompletableFuture> logoutUser(); @@ -158,7 +165,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) CompletableFuture> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 93eefd68af0..b41604a2416 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -40,7 +40,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = "application/json" ) @@ -61,7 +62,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) com.netflix.hystrix.HystrixCommand> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -83,7 +85,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = "application/json" ) @@ -107,7 +110,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = "application/json" ) @@ -131,7 +135,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = "application/json" ) @@ -155,7 +160,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = "application/json" ) @@ -177,7 +183,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = "application/x-www-form-urlencoded" ) @@ -199,7 +206,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = "application/json", consumes = "multipart/form-data" diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 5a23e71468e..7d871a200db 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{orderId}" ) com.netflix.hystrix.HystrixCommand> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId); @@ -57,7 +58,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = "application/json" ) @@ -78,7 +80,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{orderId}", produces = "application/json" ) @@ -96,7 +99,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = "application/json" ) diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 0e813129335..ce67facbd04 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) com.netflix.hystrix.HystrixCommand> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -52,7 +53,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) com.netflix.hystrix.HystrixCommand> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -67,7 +69,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) com.netflix.hystrix.HystrixCommand> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -85,7 +88,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) com.netflix.hystrix.HystrixCommand> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -104,7 +108,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = "application/json" ) @@ -123,7 +128,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = "application/json" ) @@ -138,7 +144,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) com.netflix.hystrix.HystrixCommand> logoutUser(); @@ -157,7 +164,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) com.netflix.hystrix.HystrixCommand> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 398ff133bc0..3ed1bbf43bc 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -40,7 +40,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = "application/json" ) @@ -61,7 +62,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -83,7 +85,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = "application/json" ) @@ -107,7 +110,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = "application/json" ) @@ -131,7 +135,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = "application/json" ) @@ -155,7 +160,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = "application/json" ) @@ -177,7 +183,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = "application/x-www-form-urlencoded" ) @@ -199,7 +206,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = "application/json", consumes = "multipart/form-data" diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 81c7b71de1c..75d029e616f 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{orderId}" ) ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId); @@ -57,7 +58,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = "application/json" ) @@ -78,7 +80,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{orderId}", produces = "application/json" ) @@ -96,7 +99,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = "application/json" ) diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 9d0f30811ff..db03707aff2 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -52,7 +53,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -67,7 +69,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -85,7 +88,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -104,7 +108,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = "application/json" ) @@ -123,7 +128,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = "application/json" ) @@ -138,12 +144,28 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) ResponseEntity logoutUser(); + /** + * OPTIONS /user/logout : logoutUserOptions + * + * @return endpoint configuration response (status code 200) + */ + @ApiOperation(value = "logoutUserOptions", nickname = "logoutUserOptions", notes = "", tags={ "user", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "endpoint configuration response") }) + @RequestMapping( + method = RequestMethod.OPTIONS, + value = "/user/logout" + ) + ResponseEntity logoutUserOptions(); + + /** * PUT /user/{username} : Updated user * This can only be done by the logged in user. @@ -157,7 +179,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); 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 93eefd68af0..b41604a2416 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 @@ -40,7 +40,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = "application/json" ) @@ -61,7 +62,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) com.netflix.hystrix.HystrixCommand> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -83,7 +85,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = "application/json" ) @@ -107,7 +110,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = "application/json" ) @@ -131,7 +135,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = "application/json" ) @@ -155,7 +160,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = "application/json" ) @@ -177,7 +183,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = "application/x-www-form-urlencoded" ) @@ -199,7 +206,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = "application/json", consumes = "multipart/form-data" 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 5a23e71468e..7d871a200db 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 @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{orderId}" ) com.netflix.hystrix.HystrixCommand> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId); @@ -57,7 +58,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = "application/json" ) @@ -78,7 +80,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{orderId}", produces = "application/json" ) @@ -96,7 +99,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = "application/json" ) 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 0e813129335..ce67facbd04 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 @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) com.netflix.hystrix.HystrixCommand> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -52,7 +53,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) com.netflix.hystrix.HystrixCommand> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -67,7 +69,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) com.netflix.hystrix.HystrixCommand> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -85,7 +88,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) com.netflix.hystrix.HystrixCommand> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -104,7 +108,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = "application/json" ) @@ -123,7 +128,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = "application/json" ) @@ -138,7 +144,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) com.netflix.hystrix.HystrixCommand> logoutUser(); @@ -157,7 +164,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) com.netflix.hystrix.HystrixCommand> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); 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 9fd9bb27849..09d81f8f5bb 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 @@ -44,7 +44,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = "application/json" ) @@ -68,7 +69,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -93,7 +95,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = "application/json" ) @@ -134,7 +137,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = "application/json" ) @@ -175,7 +179,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = "application/json" ) @@ -216,7 +221,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = "application/json" ) @@ -241,7 +247,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = "application/x-www-form-urlencoded" ) @@ -266,7 +273,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = "application/json", consumes = "multipart/form-data" 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 673f1f6b32b..0c1bf6dacb3 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{orderId}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = "application/json" ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{orderId}", produces = "application/json" ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = "application/json" ) 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 5a6d3ac6934..e99b43bb880 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = "application/json" ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = "application/json" ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 3a460d22d20..d3de521c130 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -50,7 +50,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet"], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] @@ -67,7 +68,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid pet value")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long @@ -85,7 +87,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) @@ -103,7 +106,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) @@ -120,7 +124,8 @@ interface PetApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) @@ -137,7 +142,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/pet"], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] @@ -154,7 +160,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) @@ -173,7 +180,8 @@ interface PetApi { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}/uploadImage"], produces = ["application/json"], consumes = ["multipart/form-data"] diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 2e7ef4baf88..f07c2b2ce5c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -47,7 +47,8 @@ interface StoreApi { notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String @@ -64,7 +65,8 @@ interface StoreApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/inventory"], produces = ["application/json"] ) @@ -79,7 +81,8 @@ interface StoreApi { response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) @@ -95,7 +98,8 @@ interface StoreApi { response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/store/order"], produces = ["application/xml", "application/json"], consumes = ["application/json"] diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 681de2dadf9..f9a0bc72057 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -48,7 +48,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user"], consumes = ["application/json"] ) @@ -64,7 +65,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithArray"], consumes = ["application/json"] ) @@ -80,7 +82,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithList"], consumes = ["application/json"] ) @@ -96,7 +99,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/user/{username}"] ) fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String @@ -111,7 +115,8 @@ interface UserApi { response = User::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) @@ -127,7 +132,8 @@ interface UserApi { response = kotlin.String::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/login"], produces = ["application/xml", "application/json"] ) @@ -144,7 +150,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { @@ -158,7 +165,8 @@ interface UserApi { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/user/{username}"], consumes = ["application/json"] ) diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt index 7ac18d95d84..8430a1333aa 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -44,7 +44,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet"], consumes = ["application/json", "application/xml"] ) @@ -60,7 +61,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid pet value")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) suspend fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long @@ -78,7 +80,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) @@ -96,7 +99,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) @@ -113,7 +117,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) @@ -129,7 +134,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/pet"], consumes = ["application/json", "application/xml"] ) @@ -145,7 +151,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) @@ -164,7 +171,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}/uploadImage"], produces = ["application/json"], consumes = ["multipart/form-data"] diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt index dde98ffba08..24dbff458d3 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -42,7 +42,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) suspend fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String @@ -59,7 +60,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/inventory"], produces = ["application/json"] ) @@ -74,7 +76,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) @@ -90,7 +93,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/store/order"], produces = ["application/xml", "application/json"] ) diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt index d369aefe48c..9881ade4a16 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -42,7 +42,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user"] ) suspend fun createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody body: User @@ -56,7 +57,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithArray"] ) suspend fun createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: Flow @@ -70,7 +72,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithList"] ) suspend fun createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: Flow @@ -84,7 +87,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/user/{username}"] ) suspend fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String @@ -99,7 +103,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) response = User::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) @@ -115,7 +120,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) response = kotlin.String::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/login"], produces = ["application/xml", "application/json"] ) @@ -131,7 +137,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/logout"] ) suspend fun logoutUser(): ResponseEntity { @@ -144,7 +151,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/user/{username}"] ) suspend fun updateUser(@ApiParam(value = "name that need to be deleted", required=true) @PathVariable("username") username: kotlin.String diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt index 9de503175ac..a26504324da 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -43,7 +43,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet"], consumes = ["application/json", "application/xml"] ) @@ -59,7 +60,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid pet value")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long @@ -77,7 +79,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) @@ -95,7 +98,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) @@ -112,7 +116,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) @@ -128,7 +133,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/pet"], consumes = ["application/json", "application/xml"] ) @@ -144,7 +150,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 405, message = "Invalid input")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) @@ -163,7 +170,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/pet/{petId}/uploadImage"], produces = ["application/json"], consumes = ["multipart/form-data"] diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt index 3b82141c4df..e2be73b4ec3 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -41,7 +41,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String @@ -58,7 +59,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic authorizations = [Authorization(value = "api_key")]) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/inventory"], produces = ["application/json"] ) @@ -73,7 +75,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) @@ -89,7 +92,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic response = Order::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/store/order"], produces = ["application/xml", "application/json"] ) diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt index 7071afde110..f7c4144fbdb 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -41,7 +41,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user"] ) fun createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody body: User @@ -55,7 +56,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithArray"] ) fun createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: kotlin.collections.List @@ -69,7 +71,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @PostMapping( + @RequestMapping( + method = [RequestMethod.POST], value = ["/user/createWithList"] ) fun createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: kotlin.collections.List @@ -83,7 +86,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @DeleteMapping( + @RequestMapping( + method = [RequestMethod.DELETE], value = ["/user/{username}"] ) fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String @@ -98,7 +102,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) response = User::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) @@ -114,7 +119,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) response = kotlin.String::class) @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/login"], produces = ["application/xml", "application/json"] ) @@ -130,7 +136,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "") @ApiResponses( value = [ApiResponse(code = 200, message = "successful operation")]) - @GetMapping( + @RequestMapping( + method = [RequestMethod.GET], value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { @@ -143,7 +150,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) notes = "This can only be done by the logged in user.") @ApiResponses( value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")]) - @PutMapping( + @RequestMapping( + method = [RequestMethod.PUT], value = ["/user/{username}"] ) fun updateUser(@ApiParam(value = "name that need to be deleted", required=true) @PathVariable("username") username: kotlin.String diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java index 302b53196c7..e5ab8393a2e 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java @@ -46,7 +46,8 @@ public interface TestHeadersApi { @ApiOperation(value = "test headers", nickname = "headersTest", notes = "desc", response = TestResponse.class, tags={ "verify-default-value", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "default response", response = TestResponse.class) }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/test-headers", produces = { "application/json" } ) diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java index 1238f1af6c0..a8ebe202b01 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java @@ -46,7 +46,8 @@ public interface TestQueryParamsApi { @ApiOperation(value = "test query params", nickname = "queryParamsTest", notes = "desc", response = TestResponse.class, tags={ "verify-default-value", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "default response", response = TestResponse.class) }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/test-query-params", produces = { "application/json" } ) 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 d7e4c9cba9e..2c0dfcfe71c 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 @@ -41,7 +41,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 d06d27d099a..b6c46774a7a 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 @@ -50,7 +50,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -70,7 +71,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -90,7 +92,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -121,7 +124,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -141,7 +145,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -161,7 +166,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -181,7 +187,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -201,7 +208,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -251,7 +259,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -280,7 +289,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -305,7 +315,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default CompletableFuture> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -323,7 +334,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -343,7 +355,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -367,7 +380,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default CompletableFuture> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -391,7 +405,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 f57e8fffab3..01014fcef3c 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 @@ -44,7 +44,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 7392891444f..9f0535df6b3 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 @@ -48,7 +48,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -74,7 +75,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default CompletableFuture> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -99,7 +101,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -142,7 +145,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -185,7 +189,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -230,7 +235,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -255,7 +261,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -280,7 +287,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 a6a2f5bc9e3..1ce2d8d1d60 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 @@ -44,7 +44,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default CompletableFuture> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -65,7 +66,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -89,7 +91,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -126,7 +129,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 cbc973173cb..1da06389b4a 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 @@ -42,7 +42,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default CompletableFuture> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -60,7 +61,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default CompletableFuture> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -78,7 +80,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default CompletableFuture> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -99,7 +102,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default CompletableFuture> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -121,7 +125,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -159,7 +164,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -177,7 +183,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default CompletableFuture> logoutUser() { @@ -199,7 +206,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default CompletableFuture> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 64cbfe9d780..130a8494dbb 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 8a06982a3fc..a898482842c 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 9c5f60b0692..9d69007a5fc 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 ef12458e572..eeb313bb64d 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 60f43330244..b0c9dda385a 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 999e354510c..94d6d8a54d2 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 64cbfe9d780..130a8494dbb 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 771534d2d4f..66905f536da 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9c5f60b0692..9d69007a5fc 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java index ef12458e572..eeb313bb64d 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 60f43330244..b0c9dda385a 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 999e354510c..94d6d8a54d2 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 64cbfe9d780..130a8494dbb 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 7ebc773cf49..699019c6df0 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9c5f60b0692..9d69007a5fc 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 2214da8b9fa..a7a3e735c41 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -46,7 +46,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -72,7 +73,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -97,7 +99,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -138,7 +141,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -179,7 +183,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -222,7 +227,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -247,7 +253,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -272,7 +279,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 60f43330244..b0c9dda385a 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 999e354510c..94d6d8a54d2 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 64cbfe9d780..130a8494dbb 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 771534d2d4f..66905f536da 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 9c5f60b0692..9d69007a5fc 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 ef12458e572..eeb313bb64d 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 60f43330244..b0c9dda385a 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 999e354510c..94d6d8a54d2 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index eebc98d2dfa..ad33c6f7a83 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -32,7 +32,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 70c9a533c63..eaef34c8ba3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -41,7 +41,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -58,7 +59,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -75,7 +77,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -92,7 +95,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -109,7 +113,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -126,7 +131,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -143,7 +149,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -160,7 +167,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -196,7 +204,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -222,7 +231,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +254,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group); @@ -259,7 +270,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -276,7 +288,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -297,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context); @@ -318,7 +332,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 42cdda440d2..8b3234b7a1e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 150a5332459..07e67b5ada8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -39,7 +39,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -62,7 +63,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -84,7 +86,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -108,7 +111,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -132,7 +136,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -158,7 +163,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -180,7 +186,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -202,7 +209,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 8f23fb41091..d8ecb702f91 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -35,7 +35,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId); @@ -53,7 +54,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -74,7 +76,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -92,7 +95,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index cb03e6c990b..5af29da805a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -33,7 +33,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -48,7 +49,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -63,7 +65,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -81,7 +84,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -100,7 +104,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -119,7 +124,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -134,7 +140,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) ResponseEntity logoutUser(); @@ -153,7 +160,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); 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 64cbfe9d780..130a8494dbb 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 771534d2d4f..66905f536da 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 9c5f60b0692..9d69007a5fc 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 ef12458e572..eeb313bb64d 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 60f43330244..b0c9dda385a 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 999e354510c..94d6d8a54d2 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 d6b43670cdb..245441f9a23 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 @@ -36,7 +36,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 6e5e680c167..f9592af7f37 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 @@ -45,7 +45,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -64,7 +65,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -83,7 +85,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -102,7 +105,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -121,7 +125,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -140,7 +145,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -159,7 +165,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -178,7 +185,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -216,7 +224,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +253,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -268,7 +278,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -285,7 +296,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -304,7 +316,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -327,7 +340,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -350,7 +364,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 fcc94e9fea3..d2d52eeda84 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 @@ -39,7 +39,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 4c6387ff522..85b266f87c4 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 @@ -43,7 +43,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -68,7 +69,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -92,7 +94,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -118,7 +121,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -144,7 +148,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -172,7 +177,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -196,7 +202,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -220,7 +227,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 ed840b0974f..79d9cbba24e 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 @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -59,7 +60,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -82,7 +84,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -102,7 +105,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 5f320c6d887..a662b5e4936 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 @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -54,7 +55,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -71,7 +73,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -91,7 +94,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -112,7 +116,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -133,7 +138,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -150,7 +156,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -171,7 +178,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 d6b43670cdb..245441f9a23 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 @@ -36,7 +36,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 6e5e680c167..f9592af7f37 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 @@ -45,7 +45,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -64,7 +65,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -83,7 +85,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -102,7 +105,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -121,7 +125,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -140,7 +145,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -159,7 +165,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -178,7 +185,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -216,7 +224,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +253,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -268,7 +278,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -285,7 +296,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -304,7 +316,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -327,7 +340,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -350,7 +364,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 fcc94e9fea3..d2d52eeda84 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 @@ -39,7 +39,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 4c6387ff522..85b266f87c4 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 @@ -43,7 +43,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -68,7 +69,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -92,7 +94,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -118,7 +121,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -144,7 +148,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -172,7 +177,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -196,7 +202,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -220,7 +227,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 ed840b0974f..79d9cbba24e 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 @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -59,7 +60,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -82,7 +84,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -102,7 +105,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 5f320c6d887..a662b5e4936 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 @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -54,7 +55,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -71,7 +73,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -91,7 +94,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -112,7 +116,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -133,7 +138,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -150,7 +156,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -171,7 +178,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 848d47ae9a7..be1d9e3ad35 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 @@ -42,7 +42,8 @@ public interface AnotherFakeApi { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) @ApiImplicitParams({ }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 f1accae4815..c28a732e3bf 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 @@ -51,7 +51,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -73,7 +74,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -95,7 +97,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -126,7 +129,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -148,7 +152,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Output string", response = String.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -170,7 +175,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Success") }) @ApiImplicitParams({ }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -192,7 +198,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Success") }) @ApiImplicitParams({ }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -214,7 +221,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) @ApiImplicitParams({ }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -264,7 +272,8 @@ public interface FakeApi { @ApiResponse(code = 404, message = "User not found") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -295,7 +304,8 @@ public interface FakeApi { @ApiImplicitParam(name = "enumHeaderStringArray", value = "Header parameter enum test (string array)", dataType = "List", paramType = "header"), @ApiImplicitParam(name = "enumHeaderString", value = "Header parameter enum test (string)", dataType = "String", paramType = "header") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -322,7 +332,8 @@ public interface FakeApi { @ApiImplicitParam(name = "requiredBooleanGroup", value = "Required Boolean in group parameters", required=true, dataType = "Boolean", paramType = "header"), @ApiImplicitParam(name = "booleanGroup", value = "Boolean in group parameters", dataType = "Boolean", paramType = "header") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -342,7 +353,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -364,7 +376,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -390,7 +403,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Success") }) @ApiImplicitParams({ }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -416,7 +430,8 @@ public interface FakeApi { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 a5be0ff3227..21cdb4eff66 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 @@ -45,7 +45,8 @@ public interface FakeClassnameTestApi { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) @ApiImplicitParams({ }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 cddc74a5094..c7127759e32 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 @@ -49,7 +49,8 @@ public interface PetApi { @ApiResponse(code = 405, message = "Invalid input") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -77,7 +78,8 @@ public interface PetApi { @ApiImplicitParams({ @ApiImplicitParam(name = "apiKey", value = "", dataType = "String", paramType = "header") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId) { @@ -104,7 +106,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid status value") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -147,7 +150,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid tag value") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -190,7 +194,8 @@ public interface PetApi { @ApiResponse(code = 404, message = "Pet not found") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -235,7 +240,8 @@ public interface PetApi { @ApiResponse(code = 405, message = "Validation exception") }) @ApiImplicitParams({ }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -262,7 +268,8 @@ public interface PetApi { @ApiResponse(code = 405, message = "Invalid input") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -289,7 +296,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 c3b19cbc6b1..b7ae71e7ee2 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 @@ -45,7 +45,8 @@ public interface StoreApi { @ApiResponse(code = 404, message = "Order not found") }) @ApiImplicitParams({ }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -68,7 +69,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -94,7 +96,8 @@ public interface StoreApi { @ApiResponse(code = 404, message = "Order not found") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -131,7 +134,8 @@ public interface StoreApi { @ApiResponse(code = 400, message = "Invalid Order") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 1413ef568dc..2029fcada31 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 @@ -43,7 +43,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -63,7 +64,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -83,7 +85,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -106,7 +109,8 @@ public interface UserApi { @ApiResponse(code = 404, message = "User not found") }) @ApiImplicitParams({ }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -130,7 +134,8 @@ public interface UserApi { @ApiResponse(code = 404, message = "User not found") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -168,7 +173,8 @@ public interface UserApi { @ApiResponse(code = 400, message = "Invalid username/password supplied") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -188,7 +194,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation") }) @ApiImplicitParams({ }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -212,7 +219,8 @@ public interface UserApi { @ApiResponse(code = 404, message = "User not found") }) @ApiImplicitParams({ }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 f5cbb82c92b..2ec496726be 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 3fc5eb07c99..9fcdea1ba33 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -68,7 +69,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -87,7 +89,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -106,7 +109,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -125,7 +129,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -144,7 +149,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -163,7 +169,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -182,7 +189,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -220,7 +228,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -248,7 +257,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -272,7 +282,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default Mono> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group, @ApiIgnore final ServerWebExchange exchange) { @@ -289,7 +300,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -308,7 +320,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -331,7 +344,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default Mono> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange) { @@ -354,7 +368,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 00df7308c0f..4d203b46a90 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 934e81c21e9..ab93643c9de 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -72,7 +73,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default Mono> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey, @ApiIgnore final ServerWebExchange exchange) { @@ -96,7 +98,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -122,7 +125,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -148,7 +152,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -176,7 +181,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -200,7 +206,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -224,7 +231,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 87e1ee73789..8e6b22f43d6 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default Mono> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange) { @@ -63,7 +64,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -86,7 +88,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -106,7 +109,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 46a734917ec..ea4a6d014fc 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default Mono> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody Mono body, @ApiIgnore final ServerWebExchange exchange) { @@ -58,7 +59,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default Mono> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux body, @ApiIgnore final ServerWebExchange exchange) { @@ -75,7 +77,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default Mono> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux body, @ApiIgnore final ServerWebExchange exchange) { @@ -95,7 +98,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default Mono> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange) { @@ -116,7 +120,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -137,7 +142,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -154,7 +160,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default Mono> logoutUser(@ApiIgnore final ServerWebExchange exchange) { @@ -175,7 +182,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default Mono> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody Mono body, @ApiIgnore final ServerWebExchange exchange) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index eebc98d2dfa..ad33c6f7a83 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -32,7 +32,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index b89152793eb..63c0b510bb7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -41,7 +41,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -58,7 +59,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -75,7 +77,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -92,7 +95,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -109,7 +113,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -126,7 +131,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -143,7 +149,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -160,7 +167,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -196,7 +204,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -222,7 +231,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +254,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group); @@ -259,7 +270,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -276,7 +288,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -297,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context); @@ -318,7 +332,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 42cdda440d2..8b3234b7a1e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index f51338dd3fb..329f85f2de8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -38,7 +38,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -61,7 +62,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -83,7 +85,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -107,7 +110,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -131,7 +135,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -157,7 +162,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -179,7 +185,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -201,7 +208,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 8f23fb41091..d8ecb702f91 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -35,7 +35,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId); @@ -53,7 +54,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -74,7 +76,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -92,7 +95,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index cb03e6c990b..5af29da805a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -33,7 +33,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -48,7 +49,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -63,7 +65,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -81,7 +84,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -100,7 +104,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -119,7 +124,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -134,7 +140,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) ResponseEntity logoutUser(); @@ -153,7 +160,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index d6b43670cdb..245441f9a23 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -36,7 +36,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index fb71771602a..f2a0dc0da4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -45,7 +45,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -64,7 +65,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -83,7 +85,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -102,7 +105,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -121,7 +125,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -140,7 +145,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -159,7 +165,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -178,7 +185,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -216,7 +224,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +253,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -268,7 +278,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -285,7 +296,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -304,7 +316,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -327,7 +340,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -350,7 +364,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index fcc94e9fea3..d2d52eeda84 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -39,7 +39,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index 08bd0711453..2c204be7c4d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -42,7 +42,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -67,7 +68,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -91,7 +93,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -117,7 +120,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -143,7 +147,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -171,7 +176,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -195,7 +201,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -219,7 +226,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index ed840b0974f..79d9cbba24e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -39,7 +39,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -59,7 +60,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -82,7 +84,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -102,7 +105,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 5f320c6d887..a662b5e4936 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -54,7 +55,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -71,7 +73,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -91,7 +94,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -112,7 +116,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -133,7 +138,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -150,7 +156,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -171,7 +178,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index eebc98d2dfa..ad33c6f7a83 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -32,7 +32,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index b89152793eb..63c0b510bb7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -41,7 +41,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -58,7 +59,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -75,7 +77,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -92,7 +95,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -109,7 +113,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -126,7 +131,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -143,7 +149,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -160,7 +167,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -196,7 +204,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -222,7 +231,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -244,7 +254,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group); @@ -259,7 +270,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -276,7 +288,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -297,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context); @@ -318,7 +332,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 42cdda440d2..8b3234b7a1e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index f51338dd3fb..329f85f2de8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -38,7 +38,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -61,7 +62,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey); @@ -83,7 +85,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -107,7 +110,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -131,7 +135,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -157,7 +162,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -179,7 +185,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -201,7 +208,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 8f23fb41091..d8ecb702f91 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -35,7 +35,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId); @@ -53,7 +54,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -74,7 +76,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -92,7 +95,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index cb03e6c990b..5af29da805a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -33,7 +33,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body); @@ -48,7 +49,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -63,7 +65,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body); @@ -81,7 +84,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username); @@ -100,7 +104,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -119,7 +124,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -134,7 +140,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) ResponseEntity logoutUser(); @@ -153,7 +160,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 64cbfe9d780..130a8494dbb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 7ebc773cf49..699019c6df0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9c5f60b0692..9d69007a5fc 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 2214da8b9fa..a7a3e735c41 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -46,7 +46,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -72,7 +73,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -97,7 +99,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -138,7 +141,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -179,7 +183,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -222,7 +227,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -247,7 +253,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -272,7 +279,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 60f43330244..b0c9dda385a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 999e354510c..94d6d8a54d2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 64cbfe9d780..130a8494dbb 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 4cb96cc56c6..6fa55775869 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Optional stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Optional booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Optional int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 9c5f60b0692..9d69007a5fc 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 47b2cf0b3b1..f7b48a59b60 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) Optional apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 60f43330244..b0c9dda385a 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 999e354510c..94d6d8a54d2 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 e8237f4485c..34951cb89a0 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 @@ -44,7 +44,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 e778761d53f..3ce4eed402b 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 @@ -53,7 +53,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -74,7 +75,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -95,7 +97,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -125,7 +128,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -146,7 +150,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -167,7 +172,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -188,7 +194,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -209,7 +216,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -258,7 +266,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -288,7 +297,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -314,7 +324,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -333,7 +344,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -354,7 +366,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -379,7 +392,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -404,7 +418,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 5cf1ad061c5..500843d424d 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 @@ -47,7 +47,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 05e6deef8da..2318ccc478f 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 @@ -51,7 +51,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -78,7 +79,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -104,7 +106,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -146,7 +149,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -188,7 +192,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -232,7 +237,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -258,7 +264,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -284,7 +291,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 4e5a9af464d..865dd508818 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 @@ -47,7 +47,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -69,7 +70,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -94,7 +96,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -130,7 +133,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 d323b358c64..240d6031dd9 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 @@ -45,7 +45,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -64,7 +65,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -83,7 +85,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -105,7 +108,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -128,7 +132,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -165,7 +170,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -184,7 +190,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -207,7 +214,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { 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 64cbfe9d780..130a8494dbb 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 @@ -40,7 +40,8 @@ public interface AnotherFakeApi { @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/another-fake/dummy", produces = { "application/json" }, consumes = { "application/json" } 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 771534d2d4f..66905f536da 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 @@ -49,7 +49,8 @@ public interface FakeApi { @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/create_xml_item", consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @@ -69,7 +70,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/boolean", produces = { "*/*" } ) @@ -89,7 +91,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/composite", produces = { "*/*" } ) @@ -118,7 +121,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/number", produces = { "*/*" } ) @@ -138,7 +142,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Output string", response = String.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/outer/string", produces = { "*/*" } ) @@ -158,7 +163,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-file-schema", consumes = { "application/json" } ) @@ -178,7 +184,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/body-with-query-params", consumes = { "application/json" } ) @@ -198,7 +205,8 @@ public interface FakeApi { @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake", produces = { "application/json" }, consumes = { "application/json" } @@ -246,7 +254,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -275,7 +284,8 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"), @ApiResponse(code = 404, message = "Not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake", consumes = { "application/x-www-form-urlencoded" } ) @@ -300,7 +310,8 @@ public interface FakeApi { @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Someting wrong") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/fake" ) default ResponseEntity testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) { @@ -318,7 +329,8 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/inline-additionalProperties", consumes = { "application/json" } ) @@ -338,7 +350,8 @@ public interface FakeApi { @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/fake/jsonFormData", consumes = { "application/x-www-form-urlencoded" } ) @@ -362,7 +375,8 @@ public interface FakeApi { @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "Success") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/fake/test-query-paramters" ) default ResponseEntity testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context) { @@ -386,7 +400,8 @@ public interface FakeApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/fake/{petId}/uploadImageWithRequiredFile", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 9c5f60b0692..9d69007a5fc 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 @@ -43,7 +43,8 @@ public interface FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - @PatchMapping( + @RequestMapping( + method = RequestMethod.PATCH, value = "/fake_classname_test", produces = { "application/json" }, consumes = { "application/json" } 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 ef12458e572..eeb313bb64d 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 @@ -47,7 +47,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -73,7 +74,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation"), @ApiResponse(code = 400, message = "Invalid pet value") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/pet/{petId}" ) default ResponseEntity deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) { @@ -98,7 +100,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) @@ -139,7 +142,8 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) @@ -180,7 +184,8 @@ public interface PetApi { @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/pet/{petId}", produces = { "application/xml", "application/json" } ) @@ -223,7 +228,8 @@ public interface PetApi { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Pet not found"), @ApiResponse(code = 405, message = "Validation exception") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/pet", consumes = { "application/json", "application/xml" } ) @@ -248,7 +254,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}", consumes = { "application/x-www-form-urlencoded" } ) @@ -273,7 +280,8 @@ public interface PetApi { }, tags={ "pet", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/pet/{petId}/uploadImage", produces = { "application/json" }, consumes = { "multipart/form-data" } 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 60f43330244..b0c9dda385a 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 @@ -43,7 +43,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/store/order/{order_id}" ) default ResponseEntity deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) { @@ -64,7 +65,8 @@ public interface StoreApi { }, tags={ "store", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/inventory", produces = { "application/json" } ) @@ -88,7 +90,8 @@ public interface StoreApi { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid ID supplied"), @ApiResponse(code = 404, message = "Order not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/store/order/{order_id}", produces = { "application/xml", "application/json" } ) @@ -123,7 +126,8 @@ public interface StoreApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/store/order", produces = { "application/xml", "application/json" } ) 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 999e354510c..94d6d8a54d2 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 @@ -41,7 +41,8 @@ public interface UserApi { @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user" ) default ResponseEntity createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body) { @@ -59,7 +60,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithArray" ) default ResponseEntity createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -77,7 +79,8 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @PostMapping( + @RequestMapping( + method = RequestMethod.POST, value = "/user/createWithList" ) default ResponseEntity createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody List body) { @@ -98,7 +101,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @DeleteMapping( + @RequestMapping( + method = RequestMethod.DELETE, value = "/user/{username}" ) default ResponseEntity deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) { @@ -120,7 +124,8 @@ public interface UserApi { @ApiResponse(code = 200, message = "successful operation", response = User.class), @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/{username}", produces = { "application/xml", "application/json" } ) @@ -156,7 +161,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/login", produces = { "application/xml", "application/json" } ) @@ -174,7 +180,8 @@ public interface UserApi { @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - @GetMapping( + @RequestMapping( + method = RequestMethod.GET, value = "/user/logout" ) default ResponseEntity logoutUser() { @@ -196,7 +203,8 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - @PutMapping( + @RequestMapping( + method = RequestMethod.PUT, value = "/user/{username}" ) default ResponseEntity updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true ) @Valid @RequestBody User body) { From d68c14cf98396b323b30b06bc75c54f91f1d38cc Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 28 Jul 2021 11:03:24 +0800 Subject: [PATCH 06/72] use fully qualified name for Pageable (#10045) --- .../src/main/resources/JavaSpring/api.mustache | 7 ++----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/main/java/org/openapitools/api/PetApi.java | 4 ++-- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index d8b38705778..5a9522ffcfd 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -20,9 +20,6 @@ import org.springframework.http.ResponseEntity; {{#useBeanValidation}} import org.springframework.validation.annotation.Validated; {{/useBeanValidation}} -{{#vendorExtensions.x-spring-paginated}} -import org.springframework.data.domain.Pageable; -{{/vendorExtensions.x-spring-paginated}} import org.springframework.web.bind.annotation.*; {{#jdk8-no-delegate}} {{^reactive}} @@ -128,13 +125,13 @@ public interface {{classname}} { produces = { {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }{{/hasProduces}}{{#hasConsumes}}, consumes = { {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }{{/hasConsumes}}{{/singleContentTypes}} ) - {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}},{{/-last}}{{#-last}}{{#reactive}}, {{/reactive}}{{/-last}}{{/allParams}}{{#reactive}}@ApiIgnore final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}}{{#unhandledException}} throws Exception{{/unhandledException}} { + {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}},{{/-last}}{{#-last}}{{#reactive}}, {{/reactive}}{{/-last}}{{/allParams}}{{#reactive}}@ApiIgnore final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final org.springframework.data.domain.Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}}{{#unhandledException}} throws Exception{{/unhandledException}} { {{#delegate-method}} return {{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, pageable{{/vendorExtensions.x-spring-paginated}}); } // Override this method - {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}@ApiIgnore final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { + {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}@ApiIgnore final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final org.springframework.data.domain.Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { {{/delegate-method}} {{^isDelegate}} {{>methodBody}} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 3ed1bbf43bc..4f2934463f1 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -90,7 +90,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = "application/json" ) - ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** @@ -115,7 +115,7 @@ public interface PetApi { value = "/pet/findByTags", produces = "application/json" ) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index a7a3e735c41..a68214b854f 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -104,7 +104,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { @@ -146,7 +146,7 @@ public interface PetApi { value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index 329f85f2de8..ff2a4095be3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -90,7 +90,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** @@ -115,7 +115,7 @@ public interface PetApi { value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index 2c204be7c4d..f7b2a4aab46 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -98,7 +98,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { return getDelegate().findPetsByStatus(status, pageable); } @@ -125,7 +125,7 @@ public interface PetApi { value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { return getDelegate().findPetsByTags(tags, pageable); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index 329f85f2de8..ff2a4095be3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -90,7 +90,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** @@ -115,7 +115,7 @@ public interface PetApi { value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable); /** diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index a7a3e735c41..a68214b854f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -104,7 +104,7 @@ public interface PetApi { value = "/pet/findByStatus", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { @@ -146,7 +146,7 @@ public interface PetApi { value = "/pet/findByTags", produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final org.springframework.data.domain.Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { From 4c8c576a0f2c17487014b28c9e3c9280447525bd Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 28 Jul 2021 11:13:49 +0800 Subject: [PATCH 07/72] add new file --- .../petstore/jaxrs-resteasy/java8/.openapi-generator/FILES | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES index 654b846c19e..92cab26a5a2 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md build.gradle pom.xml From 870ef3a87ac5a9751198ea0f0e36c821563b5e61 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Wed, 28 Jul 2021 17:19:47 +0800 Subject: [PATCH 08/72] [go-server] Allow user to specify how errors are handled (#9764) * Added error.go * Updated controller to use error * Fix redeclared func * Add generated files * Merge * Added docs * Remove variadic * Regenerate files * Updated go doc to meet standard * Updated doc to meet go standard * Updated --- .../codegen/languages/GoServerCodegen.java | 1 + .../go-server/controller-api.mustache | 48 ++++++++++----- .../main/resources/go-server/error.mustache | 35 +++++++++++ .../go-api-server/.openapi-generator/FILES | 1 + .../petstore/go-api-server/go/api_pet.go | 60 ++++++++++++------- .../petstore/go-api-server/go/api_store.go | 38 +++++++++--- .../petstore/go-api-server/go/api_user.go | 50 +++++++++++----- .../server/petstore/go-api-server/go/error.go | 43 +++++++++++++ .../go-chi-server/.openapi-generator/FILES | 1 + .../petstore/go-chi-server/go/api_pet.go | 60 ++++++++++++------- .../petstore/go-chi-server/go/api_store.go | 38 +++++++++--- .../petstore/go-chi-server/go/api_user.go | 50 +++++++++++----- .../server/petstore/go-chi-server/go/error.go | 43 +++++++++++++ 13 files changed, 366 insertions(+), 102 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/go-server/error.mustache create mode 100644 samples/server/petstore/go-api-server/go/error.go create mode 100644 samples/server/petstore/go-chi-server/go/error.go diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java index 49ab62e2b68..5f9734460f8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java @@ -244,6 +244,7 @@ public class GoServerCodegen extends AbstractGoCodegen { supportingFiles.add(new SupportingFile("impl.mustache",sourceFolder, "impl.go")); supportingFiles.add(new SupportingFile("helpers.mustache", sourceFolder, "helpers.go")); supportingFiles.add(new SupportingFile("api.mustache", sourceFolder, "api.go")); + supportingFiles.add(new SupportingFile("error.mustache", sourceFolder, "error.go")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md") .doNotOverwrite()); } diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache index 6dd5138e525..7a7b1262308 100644 --- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache @@ -16,14 +16,34 @@ import ( {{/routers}} ) -// A {{classname}}Controller binds http requests to an api service and writes the service results to the http response +// {{classname}}Controller binds http requests to an api service and writes the service results to the http response type {{classname}}Controller struct { service {{classname}}Servicer + errorHandler ErrorHandler +} + +// {{classname}}Option for how the controller is set up. +type {{classname}}Option func(*{{classname}}Controller) + +// With{{classname}}ErrorHandler inject ErrorHandler into controller +func With{{classname}}ErrorHandler(h ErrorHandler) {{classname}}Option { + return func(c *{{classname}}Controller) { + c.errorHandler = h + } } // New{{classname}}Controller creates a default api controller -func New{{classname}}Controller(s {{classname}}Servicer) Router { - return &{{classname}}Controller{service: s} +func New{{classname}}Controller(s {{classname}}Servicer, opts ...{{classname}}Option) Router { + controller := &{{classname}}Controller{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the {{classname}}Controller @@ -43,13 +63,13 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{#hasFormParams}} {{#isMultipart}} if err := r.ParseMultipartForm(32 << 20); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isMultipart}} {{^isMultipart}} if err := r.ParseForm(); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isMultipart}} @@ -69,14 +89,14 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{#isLong}} {{paramName}}, err := parseInt64Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isLong}} {{#isInteger}} {{paramName}}, err := parseInt32Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isInteger}} @@ -89,14 +109,14 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{#isLong}} {{paramName}}, err := parseInt64Parameter(query.Get("{{baseName}}"), {{required}}) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isLong}} {{#isInteger}} {{paramName}}, err := parseInt32Parameter(query.Get("{{baseName}}"), {{required}}) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isInteger}} @@ -121,7 +141,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{paramName}}, err := ReadFormFileToTempFile(r, "{{baseName}}") {{/isArray}} if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isFile}} @@ -129,7 +149,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{paramName}}, err := parseInt64ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}} {{paramName}}, err := parseInt64Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}} if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isLong}} @@ -137,7 +157,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{paramName}}, err := parseInt32ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}} {{paramName}}, err := parseInt32Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}} if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isInteger}} @@ -153,7 +173,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{#isBodyParam}} {{paramName}} := &{{dataType}}{} if err := json.NewDecoder(r.Body).Decode(&{{paramName}}); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } {{/isBodyParam}} @@ -161,7 +181,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re result, err := c.service.{{nickname}}(r.Context(){{#allParams}}, {{#isBodyParam}}*{{/isBodyParam}}{{paramName}}{{/allParams}}) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code,{{#addResponseHeaders}} result.Headers,{{/addResponseHeaders}} w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/modules/openapi-generator/src/main/resources/go-server/error.mustache b/modules/openapi-generator/src/main/resources/go-server/error.mustache new file mode 100644 index 00000000000..cf22da170fa --- /dev/null +++ b/modules/openapi-generator/src/main/resources/go-server/error.mustache @@ -0,0 +1,35 @@ +{{>partial_header}} +package {{packageName}} + +import ( + "net/http" +) + +// ParsingError indicates that an error has occurred when parsing request parameters +type ParsingError struct { + Err error +} + +func (e *ParsingError) Unwrap() error { + return e.Err +} + +func (e *ParsingError) Error() string { + return e.Err.Error() +} + +// ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if +// you would like errors to be handled differently from the DefaultErrorHandler +type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) + +// DefaultErrorHandler defines the default logic on how to handle errors from the controller. Any errors from parsing +// request params will return a StatusBadRequest. Otherwise, the error code originating from the servicer will be used. +func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) { + if _, ok := err.(*ParsingError); ok { + // Handle parsing errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest),{{#addResponseHeaders}} map[string][]string{},{{/addResponseHeaders}} w) + } else { + // Handle all other errors + EncodeJSONResponse(err.Error(), &result.Code,{{#addResponseHeaders}} result.Headers,{{/addResponseHeaders}} w) + } +} diff --git a/samples/server/petstore/go-api-server/.openapi-generator/FILES b/samples/server/petstore/go-api-server/.openapi-generator/FILES index 9135763258f..59b4003ddce 100644 --- a/samples/server/petstore/go-api-server/.openapi-generator/FILES +++ b/samples/server/petstore/go-api-server/.openapi-generator/FILES @@ -9,6 +9,7 @@ go/api_store.go go/api_store_service.go go/api_user.go go/api_user_service.go +go/error.go go/helpers.go go/impl.go go/logger.go diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go index cc38d894e67..fc0fb309883 100644 --- a/samples/server/petstore/go-api-server/go/api_pet.go +++ b/samples/server/petstore/go-api-server/go/api_pet.go @@ -17,14 +17,34 @@ import ( "github.com/gorilla/mux" ) -// A PetApiController binds http requests to an api service and writes the service results to the http response +// PetApiController binds http requests to an api service and writes the service results to the http response type PetApiController struct { service PetApiServicer + errorHandler ErrorHandler +} + +// PetApiOption for how the controller is set up. +type PetApiOption func(*PetApiController) + +// WithPetApiErrorHandler inject ErrorHandler into controller +func WithPetApiErrorHandler(h ErrorHandler) PetApiOption { + return func(c *PetApiController) { + c.errorHandler = h + } } // NewPetApiController creates a default api controller -func NewPetApiController(s PetApiServicer) Router { - return &PetApiController{service: s} +func NewPetApiController(s PetApiServicer, opts ...PetApiOption) Router { + controller := &PetApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the PetApiController @@ -85,13 +105,13 @@ func (c *PetApiController) Routes() Routes { func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { pet := &Pet{} if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.AddPet(r.Context(), *pet) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -104,7 +124,7 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) petId, err := parseInt64Parameter(params["petId"], true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -112,7 +132,7 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { result, err := c.service.DeletePet(r.Context(), petId, apiKey) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -127,7 +147,7 @@ func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Reque result, err := c.service.FindPetsByStatus(r.Context(), status) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -142,7 +162,7 @@ func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request result, err := c.service.FindPetsByTags(r.Context(), tags) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -155,14 +175,14 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) petId, err := parseInt64Parameter(params["petId"], true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.GetPetById(r.Context(), petId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -174,13 +194,13 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { pet := &Pet{} if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UpdatePet(r.Context(), *pet) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -191,13 +211,13 @@ func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { // UpdatePetWithForm - Updates a pet in the store with form data func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Request) { if err := r.ParseForm(); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } params := mux.Vars(r) petId, err := parseInt64Parameter(params["petId"], true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -206,7 +226,7 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ result, err := c.service.UpdatePetWithForm(r.Context(), petId, name, status) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -217,13 +237,13 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ // UploadFile - uploads an image func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { if err := r.ParseMultipartForm(32 << 20); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } params := mux.Vars(r) petId, err := parseInt64Parameter(params["petId"], true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -231,13 +251,13 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { file, err := ReadFormFileToTempFile(r, "file") if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UploadFile(r.Context(), petId, additionalMetadata, file) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-api-server/go/api_store.go b/samples/server/petstore/go-api-server/go/api_store.go index 05df99f8bf3..f36cd41c523 100644 --- a/samples/server/petstore/go-api-server/go/api_store.go +++ b/samples/server/petstore/go-api-server/go/api_store.go @@ -17,14 +17,34 @@ import ( "github.com/gorilla/mux" ) -// A StoreApiController binds http requests to an api service and writes the service results to the http response +// StoreApiController binds http requests to an api service and writes the service results to the http response type StoreApiController struct { service StoreApiServicer + errorHandler ErrorHandler +} + +// StoreApiOption for how the controller is set up. +type StoreApiOption func(*StoreApiController) + +// WithStoreApiErrorHandler inject ErrorHandler into controller +func WithStoreApiErrorHandler(h ErrorHandler) StoreApiOption { + return func(c *StoreApiController) { + c.errorHandler = h + } } // NewStoreApiController creates a default api controller -func NewStoreApiController(s StoreApiServicer) Router { - return &StoreApiController{service: s} +func NewStoreApiController(s StoreApiServicer, opts ...StoreApiOption) Router { + controller := &StoreApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the StoreApiController @@ -65,7 +85,7 @@ func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) result, err := c.service.DeleteOrder(r.Context(), orderId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -78,7 +98,7 @@ func (c *StoreApiController) GetInventory(w http.ResponseWriter, r *http.Request result, err := c.service.GetInventory(r.Context()) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -91,14 +111,14 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request params := mux.Vars(r) orderId, err := parseInt64Parameter(params["orderId"], true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.GetOrderById(r.Context(), orderId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -110,13 +130,13 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) { order := &Order{} if err := json.NewDecoder(r.Body).Decode(&order); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.PlaceOrder(r.Context(), *order) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-api-server/go/api_user.go b/samples/server/petstore/go-api-server/go/api_user.go index 9b89014ddbc..ebbcd8ad494 100644 --- a/samples/server/petstore/go-api-server/go/api_user.go +++ b/samples/server/petstore/go-api-server/go/api_user.go @@ -17,14 +17,34 @@ import ( "github.com/gorilla/mux" ) -// A UserApiController binds http requests to an api service and writes the service results to the http response +// UserApiController binds http requests to an api service and writes the service results to the http response type UserApiController struct { service UserApiServicer + errorHandler ErrorHandler +} + +// UserApiOption for how the controller is set up. +type UserApiOption func(*UserApiController) + +// WithUserApiErrorHandler inject ErrorHandler into controller +func WithUserApiErrorHandler(h ErrorHandler) UserApiOption { + return func(c *UserApiController) { + c.errorHandler = h + } } // NewUserApiController creates a default api controller -func NewUserApiController(s UserApiServicer) Router { - return &UserApiController{service: s} +func NewUserApiController(s UserApiServicer, opts ...UserApiOption) Router { + controller := &UserApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the UserApiController @@ -85,13 +105,13 @@ func (c *UserApiController) Routes() Routes { func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { user := &User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUser(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -103,13 +123,13 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) { user := &[]User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUsersWithArrayInput(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -121,13 +141,13 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r * func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) { user := &[]User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUsersWithListInput(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -143,7 +163,7 @@ func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.DeleteUser(r.Context(), username) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -159,7 +179,7 @@ func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request result, err := c.service.GetUserByName(r.Context(), username) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -175,7 +195,7 @@ func (c *UserApiController) LoginUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.LoginUser(r.Context(), username, password) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -188,7 +208,7 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.LogoutUser(r.Context()) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -203,13 +223,13 @@ func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { user := &User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UpdateUser(r.Context(), username, *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-api-server/go/error.go b/samples/server/petstore/go-api-server/go/error.go new file mode 100644 index 00000000000..7dd60bc0850 --- /dev/null +++ b/samples/server/petstore/go-api-server/go/error.go @@ -0,0 +1,43 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "net/http" +) + +// ParsingError indicates that an error has occurred when parsing request parameters +type ParsingError struct { + Err error +} + +func (e *ParsingError) Unwrap() error { + return e.Err +} + +func (e *ParsingError) Error() string { + return e.Err.Error() +} + +// ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if +// you would like errors to be handled differently from the DefaultErrorHandler +type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) + +// DefaultErrorHandler defines the default logic on how to handle errors from the controller. Any errors from parsing +// request params will return a StatusBadRequest. Otherwise, the error code originating from the servicer will be used. +func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) { + if _, ok := err.(*ParsingError); ok { + // Handle parsing errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest), map[string][]string{}, w) + } else { + // Handle all other errors + EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + } +} diff --git a/samples/server/petstore/go-chi-server/.openapi-generator/FILES b/samples/server/petstore/go-chi-server/.openapi-generator/FILES index 9135763258f..59b4003ddce 100644 --- a/samples/server/petstore/go-chi-server/.openapi-generator/FILES +++ b/samples/server/petstore/go-chi-server/.openapi-generator/FILES @@ -9,6 +9,7 @@ go/api_store.go go/api_store_service.go go/api_user.go go/api_user_service.go +go/error.go go/helpers.go go/impl.go go/logger.go diff --git a/samples/server/petstore/go-chi-server/go/api_pet.go b/samples/server/petstore/go-chi-server/go/api_pet.go index 6d964844301..323215a42b8 100644 --- a/samples/server/petstore/go-chi-server/go/api_pet.go +++ b/samples/server/petstore/go-chi-server/go/api_pet.go @@ -17,14 +17,34 @@ import ( "github.com/go-chi/chi/v5" ) -// A PetApiController binds http requests to an api service and writes the service results to the http response +// PetApiController binds http requests to an api service and writes the service results to the http response type PetApiController struct { service PetApiServicer + errorHandler ErrorHandler +} + +// PetApiOption for how the controller is set up. +type PetApiOption func(*PetApiController) + +// WithPetApiErrorHandler inject ErrorHandler into controller +func WithPetApiErrorHandler(h ErrorHandler) PetApiOption { + return func(c *PetApiController) { + c.errorHandler = h + } } // NewPetApiController creates a default api controller -func NewPetApiController(s PetApiServicer) Router { - return &PetApiController{service: s} +func NewPetApiController(s PetApiServicer, opts ...PetApiOption) Router { + controller := &PetApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the PetApiController @@ -85,13 +105,13 @@ func (c *PetApiController) Routes() Routes { func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { pet := &Pet{} if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.AddPet(r.Context(), *pet) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -103,7 +123,7 @@ func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -111,7 +131,7 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { result, err := c.service.DeletePet(r.Context(), petId, apiKey) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -126,7 +146,7 @@ func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Reque result, err := c.service.FindPetsByStatus(r.Context(), status) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -141,7 +161,7 @@ func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request result, err := c.service.FindPetsByTags(r.Context(), tags) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -153,14 +173,14 @@ func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.GetPetById(r.Context(), petId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -172,13 +192,13 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { pet := &Pet{} if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UpdatePet(r.Context(), *pet) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -189,12 +209,12 @@ func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { // UpdatePetWithForm - Updates a pet in the store with form data func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Request) { if err := r.ParseForm(); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -203,7 +223,7 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ result, err := c.service.UpdatePetWithForm(r.Context(), petId, name, status) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -214,12 +234,12 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ // UploadFile - uploads an image func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { if err := r.ParseMultipartForm(32 << 20); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } @@ -227,13 +247,13 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { file, err := ReadFormFileToTempFile(r, "file") if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UploadFile(r.Context(), petId, additionalMetadata, file) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-chi-server/go/api_store.go b/samples/server/petstore/go-chi-server/go/api_store.go index 33b3b85494f..cd2ee935689 100644 --- a/samples/server/petstore/go-chi-server/go/api_store.go +++ b/samples/server/petstore/go-chi-server/go/api_store.go @@ -17,14 +17,34 @@ import ( "github.com/go-chi/chi/v5" ) -// A StoreApiController binds http requests to an api service and writes the service results to the http response +// StoreApiController binds http requests to an api service and writes the service results to the http response type StoreApiController struct { service StoreApiServicer + errorHandler ErrorHandler +} + +// StoreApiOption for how the controller is set up. +type StoreApiOption func(*StoreApiController) + +// WithStoreApiErrorHandler inject ErrorHandler into controller +func WithStoreApiErrorHandler(h ErrorHandler) StoreApiOption { + return func(c *StoreApiController) { + c.errorHandler = h + } } // NewStoreApiController creates a default api controller -func NewStoreApiController(s StoreApiServicer) Router { - return &StoreApiController{service: s} +func NewStoreApiController(s StoreApiServicer, opts ...StoreApiOption) Router { + controller := &StoreApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the StoreApiController @@ -64,7 +84,7 @@ func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) result, err := c.service.DeleteOrder(r.Context(), orderId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -77,7 +97,7 @@ func (c *StoreApiController) GetInventory(w http.ResponseWriter, r *http.Request result, err := c.service.GetInventory(r.Context()) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -89,14 +109,14 @@ func (c *StoreApiController) GetInventory(w http.ResponseWriter, r *http.Request func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request) { orderId, err := parseInt64Parameter(chi.URLParam(r, "orderId"), true) if err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.GetOrderById(r.Context(), orderId) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -108,13 +128,13 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) { order := &Order{} if err := json.NewDecoder(r.Body).Decode(&order); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.PlaceOrder(r.Context(), *order) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-chi-server/go/api_user.go b/samples/server/petstore/go-chi-server/go/api_user.go index 46f6ae9d90f..440cf54a437 100644 --- a/samples/server/petstore/go-chi-server/go/api_user.go +++ b/samples/server/petstore/go-chi-server/go/api_user.go @@ -17,14 +17,34 @@ import ( "github.com/go-chi/chi/v5" ) -// A UserApiController binds http requests to an api service and writes the service results to the http response +// UserApiController binds http requests to an api service and writes the service results to the http response type UserApiController struct { service UserApiServicer + errorHandler ErrorHandler +} + +// UserApiOption for how the controller is set up. +type UserApiOption func(*UserApiController) + +// WithUserApiErrorHandler inject ErrorHandler into controller +func WithUserApiErrorHandler(h ErrorHandler) UserApiOption { + return func(c *UserApiController) { + c.errorHandler = h + } } // NewUserApiController creates a default api controller -func NewUserApiController(s UserApiServicer) Router { - return &UserApiController{service: s} +func NewUserApiController(s UserApiServicer, opts ...UserApiOption) Router { + controller := &UserApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller } // Routes returns all of the api route for the UserApiController @@ -85,13 +105,13 @@ func (c *UserApiController) Routes() Routes { func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { user := &User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUser(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -103,13 +123,13 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) { user := &[]User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUsersWithArrayInput(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -121,13 +141,13 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r * func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) { user := &[]User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.CreateUsersWithListInput(r.Context(), *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -142,7 +162,7 @@ func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.DeleteUser(r.Context(), username) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -157,7 +177,7 @@ func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request result, err := c.service.GetUserByName(r.Context(), username) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -173,7 +193,7 @@ func (c *UserApiController) LoginUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.LoginUser(r.Context(), username, password) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -186,7 +206,7 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { result, err := c.service.LogoutUser(r.Context()) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code @@ -200,13 +220,13 @@ func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { user := &User{} if err := json.NewDecoder(r.Body).Decode(&user); err != nil { - w.WriteHeader(http.StatusBadRequest) + c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } result, err := c.service.UpdateUser(r.Context(), username, *user) // If an error occurred, encode the error with the status code if err != nil { - EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + c.errorHandler(w, r, err, &result) return } // If no error, encode the body and the result code diff --git a/samples/server/petstore/go-chi-server/go/error.go b/samples/server/petstore/go-chi-server/go/error.go new file mode 100644 index 00000000000..7dd60bc0850 --- /dev/null +++ b/samples/server/petstore/go-chi-server/go/error.go @@ -0,0 +1,43 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "net/http" +) + +// ParsingError indicates that an error has occurred when parsing request parameters +type ParsingError struct { + Err error +} + +func (e *ParsingError) Unwrap() error { + return e.Err +} + +func (e *ParsingError) Error() string { + return e.Err.Error() +} + +// ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if +// you would like errors to be handled differently from the DefaultErrorHandler +type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) + +// DefaultErrorHandler defines the default logic on how to handle errors from the controller. Any errors from parsing +// request params will return a StatusBadRequest. Otherwise, the error code originating from the servicer will be used. +func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) { + if _, ok := err.(*ParsingError); ok { + // Handle parsing errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest), map[string][]string{}, w) + } else { + // Handle all other errors + EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + } +} From d18ee5459cee9487924ccf407d6a18c01152879c Mon Sep 17 00:00:00 2001 From: Stefan Burnicki Date: Thu, 29 Jul 2021 04:37:31 +0200 Subject: [PATCH 09/72] [kotlin-spring] Support model objects and date-time query params (#8257) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [kotlin-spring] Support query params with model objects (#8080) Must fix #8080 * [kotlin-spring] Support parsing date and date-time parameters adopted #3860 for kotlin-spring Co-authored-by: Мышкин Максим --- .../kotlin-spring/queryParams.mustache | 2 +- .../spring/KotlinSpringServerCodegenTest.java | 107 ++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache index 53686e7b82f..7fb691c0ddc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{/swaggerAnnotations}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) {{paramName}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{/swaggerAnnotations}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{paramName}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index dc3bceaa435..6a506a7221f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -1,9 +1,11 @@ package org.openapitools.codegen.kotlin.spring; import com.google.common.collect.testing.Helpers; +import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.parser.core.models.ParseOptions; import org.apache.commons.io.FileUtils; import org.openapitools.codegen.ClientOptInput; import org.openapitools.codegen.CodegenConstants; @@ -11,10 +13,12 @@ import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.kotlin.KotlinTestUtils; import org.openapitools.codegen.languages.KotlinSpringServerCodegen; +import org.openapitools.codegen.languages.features.CXFServerFeatures; import org.testng.Assert; import org.testng.annotations.Test; import java.io.File; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Collections; @@ -253,4 +257,107 @@ public class KotlinSpringServerCodegenTest { assertFileNotContains(Paths.get(output + "/src/main/kotlin/org/openapitools/api/TestV2ApiDelegate.kt"), "suspend fun", "ApiUtil"); } + + @Test + public void doNotGenerateRequestParamForObjectQueryParam() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/objectQueryParam.yaml", null, new ParseOptions()).getOpenAPI(); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + assertFileNotContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PonyApi.kt"), "@RequestParam"); + } + + @Test + public void doGenerateRequestParamForSimpleParam() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/issue_3248.yaml", null, new ParseOptions()).getOpenAPI(); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/MonkeysApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/BearsApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CamelsApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PandasApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CrocodilesApi.kt"), "@RequestParam"); + assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PolarBearsApi.kt"), "@RequestParam"); + } + + @Test + public void generateFormatForDateAndDateTimeQueryParam() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/issue_2053.yaml", null, new ParseOptions()).getOpenAPI(); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + generator.opts(input).generate(); + + assertFileContains( + Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApi.kt"), + "@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)" + ); + assertFileContains( + Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApi.kt"), + "@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)" + ); + } } From b1a009803ec13ed7834ba4342c064b8dbf71e486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Krzemi=C5=84ski?= Date: Thu, 29 Jul 2021 12:01:44 +0200 Subject: [PATCH 10/72] [Kotlin][Multiplatform] Add missing JVM dependency (#10051) This dependency was accidentally removed in PR #9755 where we switched from `build.gradle` to `build.gradle.kts`. --- .../libraries/multiplatform/build.gradle.kts.mustache | 1 + samples/client/petstore/kotlin-multiplatform/build.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache index c6fb465777f..e0a08492c53 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache @@ -46,6 +46,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk7")) + implementation("io.ktor:ktor-client-cio-jvm:$ktor_version") } } diff --git a/samples/client/petstore/kotlin-multiplatform/build.gradle.kts b/samples/client/petstore/kotlin-multiplatform/build.gradle.kts index 1b7fdd939c3..42324041d66 100644 --- a/samples/client/petstore/kotlin-multiplatform/build.gradle.kts +++ b/samples/client/petstore/kotlin-multiplatform/build.gradle.kts @@ -46,6 +46,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk7")) + implementation("io.ktor:ktor-client-cio-jvm:$ktor_version") } } From 8a714f48d31500e9c612b0b8d347d64c83d0389b Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@users.noreply.github.com> Date: Thu, 29 Jul 2021 11:02:20 +0100 Subject: [PATCH 11/72] [Kotlin][Client] improve imports (#10052) --- .../jvm-common/infrastructure/Serializer.kt.mustache | 2 +- .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache index 31b83578e7e..b1e03a46798 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache @@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper {{/jackson}} -import java.util.Date {{#kotlinx_serialization}} +import java.util.Date import java.math.BigDecimal import java.math.BigInteger {{^threetenbp}} diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index b80e0390de2..d32b9d22c61 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -6,7 +6,6 @@ import java.time.LocalDate import java.time.LocalDateTime import java.time.OffsetDateTime import java.util.UUID -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index ec931412660..ece5c413e12 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index b80e0390de2..d32b9d22c61 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -6,7 +6,6 @@ import java.time.LocalDate import java.time.LocalDateTime import java.time.OffsetDateTime import java.util.UUID -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index ebd1a2a526b..4b9802b3874 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -1,7 +1,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index acc0b33ae20..fb425461435 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date internal object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic 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 e77581231c3..e22592e47d7 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 @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic 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 e77581231c3..e22592e47d7 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 @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index e77581231c3..e22592e47d7 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic 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 e77581231c3..e22592e47d7 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 @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import java.util.Date object Serializer { @JvmStatic From 6686048b0ee7003ec680d375ddd680b789569390 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Sat, 31 Jul 2021 20:45:35 +1000 Subject: [PATCH 12/72] Specify templateDir in all sample configs (#10062) --- bin/configs/csharp-OpenAPIClient.yaml | 1 + bin/configs/java-jersey2-8-oas2.yaml | 1 + bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml | 1 + bin/configs/java-microprofile-rest-client.yaml | 1 + bin/configs/java-resteasy.yaml | 1 + bin/configs/java-resttemplate-withXml.yaml | 1 + bin/configs/java-resttemplate.yaml | 1 + bin/configs/java-retrofit2-play26.yaml | 1 + bin/configs/java-webclient-nullable-array.yaml | 1 + bin/configs/java-webclient.yaml | 1 + bin/configs/jaxrs-spec-interface.yaml | 1 + bin/configs/jaxrs-spec.yaml | 1 + bin/configs/kotlin-spring-boot-delegate.yaml | 2 +- bin/configs/kotlin-spring-boot-reactive.yaml | 2 +- bin/configs/kotlin-spring-boot.yaml | 2 +- bin/configs/other/android-httpclient.yaml | 3 +-- bin/configs/other/android-volley.yaml | 1 + bin/configs/other/clojure.yaml | 1 + bin/configs/other/cpp-restbed-server-cpp-restbed.yaml | 1 + bin/configs/other/csharp-OpenAPIClientNet35.yaml | 1 + bin/configs/other/csharp-OpenAPIClientNet40.yaml | 1 + bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml | 1 + bin/configs/other/csharp-OpenAPIClientNetStandard.yaml | 1 + .../other/csharp-OpenAPIClientWithPropertyChanged.yaml | 1 + bin/configs/other/dynamic-html.yaml | 1 + bin/configs/other/eiffel.yaml | 1 + bin/configs/other/fsharp-functions.yaml | 1 + bin/configs/other/html.md.yaml | 1 + bin/configs/other/java-vertx-async.yaml | 1 + bin/configs/other/java-vertx-rx.yaml | 1 + bin/configs/other/javascript-closure-angular.yaml | 1 + bin/configs/other/jaxrs-spec-interface-response.yaml | 1 + bin/configs/other/jmeter.yaml | 1 + bin/configs/other/k6.yaml | 1 + bin/configs/other/kotlin-spring-boot-modelMutable.yaml | 2 +- bin/configs/other/kotlin-vertx-vertx.yaml | 1 + bin/configs/other/openapi3/android-httpclient.yaml | 3 +-- bin/configs/other/openapi3/android-volley.yaml | 1 + bin/configs/other/openapi3/clojure.yaml | 1 + .../other/openapi3/cpp-restbed-server-cpp-restbed.yaml | 1 + bin/configs/other/openapi3/csharp-OpenAPIClient.yaml | 1 + .../other/openapi3/csharp-OpenAPIClientNetStandard.yaml | 1 + .../openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml | 1 + .../other/openapi3/csharp-dotnet2-OpenAPIClient.yaml | 1 + bin/configs/other/openapi3/javascript-closure-angular.yaml | 1 + bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml | 2 +- bin/configs/other/openapi3/kotlin-spring-boot.yaml | 2 +- bin/configs/other/openapi3/typescript-angular-default.yaml | 1 + bin/configs/other/openapi3/typescript-angular-npm.yaml | 1 + .../other/openapi3/typescript-angular-with-interfaces.yaml | 1 + bin/configs/other/openapi3/typescript-aurelia-default.yaml | 1 + bin/configs/other/openapi3/typescript-fetch-default.yaml | 1 + bin/configs/other/openapi3/typescript-fetch-es6-target.yaml | 1 + .../other/openapi3/typescript-fetch-with-interfaces.yaml | 1 + .../other/openapi3/typescript-fetch-with-npm-version.yaml | 1 + bin/configs/other/openapi3/typescript-inversify.yaml | 1 + bin/configs/other/openapi3/typescript-jquery-default.yaml | 1 + bin/configs/other/openapi3/typescript-jquery-npm.yaml | 1 + bin/configs/other/openapi3/typescript-node-default.yaml | 1 + bin/configs/other/openapi3/typescript-node-npm.yaml | 1 + bin/configs/other/scala-akka-http-server.yaml | 1 + bin/configs/perl-deep_module_test.yaml | 1 + bin/configs/spring-cloud-async.yaml | 2 +- bin/configs/spring-cloud-no-nullable.yaml | 2 +- .../spring-cloud-petstore-feign-spring-pageable.yaml | 6 +++--- bin/configs/spring-cloud.yaml | 2 +- bin/configs/spring-mvc-petstore-server-spring-pageable.yaml | 6 +++--- bin/configs/spring-stubs.yaml | 1 + ...e-server-spring-pageable-delegatePattern-without-j8.yaml | 6 +++--- ...oot-petstore-server-spring-pageable-delegatePattern.yaml | 6 +++--- ...ringboot-petstore-server-spring-pageable-without-j8.yaml | 6 +++--- bin/configs/springboot-petstore-server-spring-pageable.yaml | 6 +++--- bin/configs/typescript-angular-default-v6.yaml | 1 + .../typescript-angular-single-request-parameter-v8.yaml | 1 + .../typescript-angular-v10-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v10-provided-in-root.yaml | 1 + bin/configs/typescript-angular-v11-oneOf.yaml | 1 + .../typescript-angular-v11-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v11-provided-in-root.yaml | 1 + .../typescript-angular-v6-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v6-provided-in-root.yaml | 1 + ...typescript-angular-v7-not-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v7-not-provided-in-root.yaml | 1 + .../typescript-angular-v7-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v7-provided-in-root.yaml | 1 + bin/configs/typescript-angular-v9-provided-in-any.yaml | 1 + .../typescript-angular-v9-provided-in-root-with-npm.yaml | 1 + bin/configs/typescript-angular-v9-provided-in-root.yaml | 1 + bin/configs/typescript-angular-with-npm-v6.yaml | 1 + bin/configs/typescript-angular-with-npm-v8.yaml | 1 + .../typescript-angular-with-prefixed-module-name-v8.yaml | 1 + bin/configs/typescript-aurelia-default.yaml | 1 + bin/configs/typescript-axios-composed-schemas.yaml | 1 + bin/configs/typescript-axios-default.yaml | 1 + bin/configs/typescript-axios-es6-target.yaml | 1 + bin/configs/typescript-axios-with-complex-headers.yaml | 1 + ...ke-endpoints-models-for-testing-with-http-signature.yaml | 1 + bin/configs/typescript-axios-with-interfaces.yaml | 1 + ...-axios-with-npm-version-and-separate-models-and-api.yaml | 1 + bin/configs/typescript-axios-with-npm-version.yaml | 1 + .../typescript-axios-with-single-request-parameters.yaml | 1 + bin/configs/typescript-consolidated-deno.yaml | 1 + bin/configs/typescript-consolidated-inversify.yaml | 1 + bin/configs/typescript-consolidated-jquery.yaml | 1 + .../typescript-consolidated-node-object-parameters.yaml | 1 + bin/configs/typescript-consolidated-node.yaml | 1 + bin/configs/typescript-fetch-default-v3.0.yaml | 1 + bin/configs/typescript-fetch-default.yaml | 1 + bin/configs/typescript-fetch-enum.yaml | 1 + bin/configs/typescript-fetch-es6-target.yaml | 1 + bin/configs/typescript-fetch-multiple-parameters.yaml | 1 + .../typescript-fetch-prefix-parameter-interfaces.yaml | 1 + bin/configs/typescript-fetch-sagas-and-records.yaml | 1 + bin/configs/typescript-fetch-typescript-three-plus.yaml | 1 + bin/configs/typescript-fetch-with-interfaces.yaml | 1 + bin/configs/typescript-fetch-with-npm-version.yaml | 1 + bin/configs/typescript-fetch-without-runtime-checks.yaml | 1 + bin/configs/typescript-inversify.yaml | 1 + bin/configs/typescript-jquery-default.yaml | 1 + bin/configs/typescript-jquery-npm.yaml | 1 + bin/configs/typescript-node-default.yaml | 1 + bin/configs/typescript-node-npm.yaml | 1 + bin/configs/typescript-rxjs-default.yaml | 1 + bin/configs/typescript-rxjs-es6-target.yaml | 1 + bin/configs/typescript-rxjs-with-npm-version.yaml | 1 + bin/configs/typescript-rxjs-with-progress-subscriber.yaml | 1 + 126 files changed, 138 insertions(+), 31 deletions(-) diff --git a/bin/configs/csharp-OpenAPIClient.yaml b/bin/configs/csharp-OpenAPIClient.yaml index 23b32d3c9fc..5855eb4a350 100644 --- a/bin/configs/csharp-OpenAPIClient.yaml +++ b/bin/configs/csharp-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/java-jersey2-8-oas2.yaml b/bin/configs/java-jersey2-8-oas2.yaml index 82df73fc00f..4d3253e23ee 100644 --- a/bin/configs/java-jersey2-8-oas2.yaml +++ b/bin/configs/java-jersey2-8-oas2.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/jersey2-java8 library: jersey2 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-jersey2-java8 hideGenerationTimestamp: true diff --git a/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml b/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml index 8de24bd73e5..f651475259d 100644 --- a/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml +++ b/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8 library: jersey2 inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: openapi3-extensions-x-auth-id-alias-jersey2-java8 hideGenerationTimestamp: true diff --git a/bin/configs/java-microprofile-rest-client.yaml b/bin/configs/java-microprofile-rest-client.yaml index 07c1fe806b7..2d9796db540 100644 --- a/bin/configs/java-microprofile-rest-client.yaml +++ b/bin/configs/java-microprofile-rest-client.yaml @@ -2,5 +2,6 @@ generatorName: java outputDir: samples/client/petstore/java/microprofile-rest-client library: microprofile inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: microprofile-rest-client diff --git a/bin/configs/java-resteasy.yaml b/bin/configs/java-resteasy.yaml index 26776e8f08d..a6b09924858 100644 --- a/bin/configs/java-resteasy.yaml +++ b/bin/configs/java-resteasy.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resteasy library: resteasy inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-resteasy hideGenerationTimestamp: "true" diff --git a/bin/configs/java-resttemplate-withXml.yaml b/bin/configs/java-resttemplate-withXml.yaml index 9f58d152718..c0122422f0a 100644 --- a/bin/configs/java-resttemplate-withXml.yaml +++ b/bin/configs/java-resttemplate-withXml.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resttemplate-withXml library: resttemplate inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: java8: true withXml: "true" diff --git a/bin/configs/java-resttemplate.yaml b/bin/configs/java-resttemplate.yaml index 0b980323ec3..9c61a34ba90 100644 --- a/bin/configs/java-resttemplate.yaml +++ b/bin/configs/java-resttemplate.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resttemplate library: resttemplate inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-resttemplate hideGenerationTimestamp: "true" diff --git a/bin/configs/java-retrofit2-play26.yaml b/bin/configs/java-retrofit2-play26.yaml index 5fe367fb79f..b65e8a3a95c 100644 --- a/bin/configs/java-retrofit2-play26.yaml +++ b/bin/configs/java-retrofit2-play26.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/retrofit2-play26 library: retrofit2 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: usePlayWS: "true" enableBuilderSupport: "true" diff --git a/bin/configs/java-webclient-nullable-array.yaml b/bin/configs/java-webclient-nullable-array.yaml index 224f2285208..24d280bc8cb 100644 --- a/bin/configs/java-webclient-nullable-array.yaml +++ b/bin/configs/java-webclient-nullable-array.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/webclient-nulable-arrays library: webclient inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-webclient-nullable-arrays hideGenerationTimestamp: "true" diff --git a/bin/configs/java-webclient.yaml b/bin/configs/java-webclient.yaml index 8569e1e2f85..a78b3f5e47d 100644 --- a/bin/configs/java-webclient.yaml +++ b/bin/configs/java-webclient.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/webclient library: webclient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-webclient hideGenerationTimestamp: "true" diff --git a/bin/configs/jaxrs-spec-interface.yaml b/bin/configs/jaxrs-spec-interface.yaml index 2c0b68c410b..ee328043708 100644 --- a/bin/configs/jaxrs-spec-interface.yaml +++ b/bin/configs/jaxrs-spec-interface.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec-interface inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-interface-petstore-server interfaceOnly: "true" diff --git a/bin/configs/jaxrs-spec.yaml b/bin/configs/jaxrs-spec.yaml index df44fac3717..9e98a9ae5c8 100644 --- a/bin/configs/jaxrs-spec.yaml +++ b/bin/configs/jaxrs-spec.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-petstore-server serializableModel: "true" diff --git a/bin/configs/kotlin-spring-boot-delegate.yaml b/bin/configs/kotlin-spring-boot-delegate.yaml index 173713600fe..bd6d7956b08 100644 --- a/bin/configs/kotlin-spring-boot-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-delegate.yaml @@ -1,9 +1,9 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-delegate +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - library: spring-boot delegatePattern: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/kotlin-spring-boot-reactive.yaml b/bin/configs/kotlin-spring-boot-reactive.yaml index 4730069192b..01b616d2122 100644 --- a/bin/configs/kotlin-spring-boot-reactive.yaml +++ b/bin/configs/kotlin-spring-boot-reactive.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-reactive +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot reactive: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/kotlin-spring-boot.yaml b/bin/configs/kotlin-spring-boot.yaml index df44a4dfb56..bc8da5b24a3 100644 --- a/bin/configs/kotlin-spring-boot.yaml +++ b/bin/configs/kotlin-spring-boot.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/android-httpclient.yaml b/bin/configs/other/android-httpclient.yaml index 1d5e23e2272..7a58659d0e3 100644 --- a/bin/configs/other/android-httpclient.yaml +++ b/bin/configs/other/android-httpclient.yaml @@ -1,6 +1,5 @@ generatorName: android outputDir: samples/client/petstore/android/httpclient +library: httpclient inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/android -additionalProperties: - library: httpclient diff --git a/bin/configs/other/android-volley.yaml b/bin/configs/other/android-volley.yaml index 63a3c42a46f..5c479033268 100644 --- a/bin/configs/other/android-volley.yaml +++ b/bin/configs/other/android-volley.yaml @@ -2,5 +2,6 @@ generatorName: android outputDir: samples/client/petstore/android/volley library: volley inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/android additionalProperties: artifactId: petstore-android-volley diff --git a/bin/configs/other/clojure.yaml b/bin/configs/other/clojure.yaml index a34be0c3037..f58c95316cd 100644 --- a/bin/configs/other/clojure.yaml +++ b/bin/configs/other/clojure.yaml @@ -1,3 +1,4 @@ generatorName: clojure outputDir: samples/client/petstore/clojure inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.json +templateDir: modules/openapi-generator/src/main/resources/clojure diff --git a/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml index 3f07a71ff07..8863620d2ae 100644 --- a/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml +++ b/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml @@ -1,3 +1,4 @@ generatorName: cpp-restbed-server outputDir: samples/server/petstore/cpp-restbed inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server diff --git a/bin/configs/other/csharp-OpenAPIClientNet35.yaml b/bin/configs/other/csharp-OpenAPIClientNet35.yaml index 3851feda103..c308c2ceed9 100644 --- a/bin/configs/other/csharp-OpenAPIClientNet35.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNet35.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNet35 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: v3.5 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientNet40.yaml b/bin/configs/other/csharp-OpenAPIClientNet40.yaml index 57f5cd15245..bd5d7cf794e 100644 --- a/bin/configs/other/csharp-OpenAPIClientNet40.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNet40.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNet40 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: v4.0 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml b/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml index 8c41863eb0e..e9fca548604 100644 --- a/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetCoreProject inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{67035b31-f8e5-41a4-9673-954035084f7d}' diff --git a/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml index d2398251e28..b4f72b50b28 100644 --- a/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml index 1ff167e0536..d5e7325510f 100644 --- a/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml +++ b/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}' generatePropertyChanged: "true" diff --git a/bin/configs/other/dynamic-html.yaml b/bin/configs/other/dynamic-html.yaml index 70904c511e1..6f32574d95a 100644 --- a/bin/configs/other/dynamic-html.yaml +++ b/bin/configs/other/dynamic-html.yaml @@ -1,3 +1,4 @@ generatorName: dynamic-html outputDir: samples/documentation/dynamic-html inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/openapi-static diff --git a/bin/configs/other/eiffel.yaml b/bin/configs/other/eiffel.yaml index 07a62662242..53f9468802d 100644 --- a/bin/configs/other/eiffel.yaml +++ b/bin/configs/other/eiffel.yaml @@ -1,3 +1,4 @@ generatorName: eiffel outputDir: samples/client/petstore/eiffel inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Eiffel diff --git a/bin/configs/other/fsharp-functions.yaml b/bin/configs/other/fsharp-functions.yaml index d88cc165284..c96a1707156 100644 --- a/bin/configs/other/fsharp-functions.yaml +++ b/bin/configs/other/fsharp-functions.yaml @@ -1,3 +1,4 @@ generatorName: fsharp-functions outputDir: samples/server/petstore/fsharp-functions inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/fsharp-functions-server diff --git a/bin/configs/other/html.md.yaml b/bin/configs/other/html.md.yaml index 31bb5790c9d..23980658eff 100644 --- a/bin/configs/other/html.md.yaml +++ b/bin/configs/other/html.md.yaml @@ -1,3 +1,4 @@ generatorName: html outputDir: samples/documentation/html.md inputSpec: modules/openapi-generator/src/test/resources/2_0/markdown.yaml +templateDir: modules/openapi-generator/src/main/resources/htmlDocs diff --git a/bin/configs/other/java-vertx-async.yaml b/bin/configs/other/java-vertx-async.yaml index e9eee5e8f64..cbc5b3c1c97 100644 --- a/bin/configs/other/java-vertx-async.yaml +++ b/bin/configs/other/java-vertx-async.yaml @@ -1,6 +1,7 @@ generatorName: java-vertx outputDir: samples/server/petstore/java-vertx/async inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer additionalProperties: hideGenerationTimestamp: "true" vertxSwaggerRouterVersion: 1.4.0 diff --git a/bin/configs/other/java-vertx-rx.yaml b/bin/configs/other/java-vertx-rx.yaml index af064e6cbaf..d5dde08656e 100644 --- a/bin/configs/other/java-vertx-rx.yaml +++ b/bin/configs/other/java-vertx-rx.yaml @@ -1,6 +1,7 @@ generatorName: java-vertx outputDir: samples/server/petstore/java-vertx/rx inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer additionalProperties: artifactId: java-vertx-rx-server hideGenerationTimestamp: "true" diff --git a/bin/configs/other/javascript-closure-angular.yaml b/bin/configs/other/javascript-closure-angular.yaml index 391b76b3e0b..d911066fc6f 100644 --- a/bin/configs/other/javascript-closure-angular.yaml +++ b/bin/configs/other/javascript-closure-angular.yaml @@ -1,3 +1,4 @@ generatorName: javascript-closure-angular outputDir: samples/client/petstore/javascript-closure-angular inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular diff --git a/bin/configs/other/jaxrs-spec-interface-response.yaml b/bin/configs/other/jaxrs-spec-interface-response.yaml index c3227e7e82e..3e4b7edfb93 100644 --- a/bin/configs/other/jaxrs-spec-interface-response.yaml +++ b/bin/configs/other/jaxrs-spec-interface-response.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec-interface-response inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-interface-response-petstore-server interfaceOnly: "true" diff --git a/bin/configs/other/jmeter.yaml b/bin/configs/other/jmeter.yaml index fb9e359ffb5..79b5de0e41b 100644 --- a/bin/configs/other/jmeter.yaml +++ b/bin/configs/other/jmeter.yaml @@ -1,3 +1,4 @@ generatorName: jmeter outputDir: samples/client/petstore/jmeter inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/jmeter-client diff --git a/bin/configs/other/k6.yaml b/bin/configs/other/k6.yaml index f1a6c1d5b23..6ac6e692dc2 100644 --- a/bin/configs/other/k6.yaml +++ b/bin/configs/other/k6.yaml @@ -1,3 +1,4 @@ generatorName: k6 outputDir: samples/client/petstore/k6 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/k6 diff --git a/bin/configs/other/kotlin-spring-boot-modelMutable.yaml b/bin/configs/other/kotlin-spring-boot-modelMutable.yaml index ca3623d059e..772d0dd7f55 100644 --- a/bin/configs/other/kotlin-spring-boot-modelMutable.yaml +++ b/bin/configs/other/kotlin-spring-boot-modelMutable.yaml @@ -1,9 +1,9 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-modelMutable +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" serviceImplementation: "true" diff --git a/bin/configs/other/kotlin-vertx-vertx.yaml b/bin/configs/other/kotlin-vertx-vertx.yaml index 83660b6c78f..64efa733325 100644 --- a/bin/configs/other/kotlin-vertx-vertx.yaml +++ b/bin/configs/other/kotlin-vertx-vertx.yaml @@ -1,5 +1,6 @@ generatorName: kotlin-vertx outputDir: samples/server/petstore/kotlin/vertx inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-vertx-server additionalProperties: modelMutable: "false" diff --git a/bin/configs/other/openapi3/android-httpclient.yaml b/bin/configs/other/openapi3/android-httpclient.yaml index 32e253e0b8d..e06c7a66fae 100644 --- a/bin/configs/other/openapi3/android-httpclient.yaml +++ b/bin/configs/other/openapi3/android-httpclient.yaml @@ -1,6 +1,5 @@ generatorName: android outputDir: samples/client/petstore/android/httpclient +library: httpclient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/android -additionalProperties: - library: httpclient diff --git a/bin/configs/other/openapi3/android-volley.yaml b/bin/configs/other/openapi3/android-volley.yaml index 4903967ef33..eee8b0e3e33 100644 --- a/bin/configs/other/openapi3/android-volley.yaml +++ b/bin/configs/other/openapi3/android-volley.yaml @@ -2,5 +2,6 @@ generatorName: android outputDir: samples/client/petstore/android/volley library: volley inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/android additionalProperties: artifactId: petstore-android-volley diff --git a/bin/configs/other/openapi3/clojure.yaml b/bin/configs/other/openapi3/clojure.yaml index 718503526fc..3c526d5ac10 100644 --- a/bin/configs/other/openapi3/clojure.yaml +++ b/bin/configs/other/openapi3/clojure.yaml @@ -1,3 +1,4 @@ generatorName: clojure outputDir: samples/client/petstore/clojure inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json +templateDir: modules/openapi-generator/src/main/resources/clojure diff --git a/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml index 8e653b8a640..d0acbda2d0e 100644 --- a/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml +++ b/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml @@ -1,3 +1,4 @@ generatorName: cpp-restbed-server outputDir: samples/server/petstore/cpp-restbed inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml index 84c5cc5af41..24a5fd2b5b3 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp outputDir: samples/openapi3/client/petstore/csharp/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml index 64635629d27..e2dcfd8e9a2 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml index 22b05d0dbbe..03034797145 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}' generatePropertyChanged: "true" diff --git a/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml b/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml index fa474d2f56f..428ce87b8b9 100644 --- a/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml +++ b/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp-dotnet2 outputDir: samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp-dotnet2 additionalProperties: hideGenerationTimestamp: "true" diff --git a/bin/configs/other/openapi3/javascript-closure-angular.yaml b/bin/configs/other/openapi3/javascript-closure-angular.yaml index 5654e7ba5cd..dd3caa461ec 100644 --- a/bin/configs/other/openapi3/javascript-closure-angular.yaml +++ b/bin/configs/other/openapi3/javascript-closure-angular.yaml @@ -1,3 +1,4 @@ generatorName: javascript-closure-angular outputDir: samples/client/petstore/javascript-closure-angular inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular diff --git a/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml b/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml index d0a726c9983..791905ed1b0 100644 --- a/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml +++ b/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/openapi3/server/petstore/kotlin-springboot-reactive +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot reactive: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/openapi3/kotlin-spring-boot.yaml b/bin/configs/other/openapi3/kotlin-spring-boot.yaml index a61d999a530..29745bc6065 100644 --- a/bin/configs/other/openapi3/kotlin-spring-boot.yaml +++ b/bin/configs/other/openapi3/kotlin-spring-boot.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/openapi3/server/petstore/kotlin-springboot +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/openapi3/typescript-angular-default.yaml b/bin/configs/other/openapi3/typescript-angular-default.yaml index b9c8bb045b9..7870bdd592e 100644 --- a/bin/configs/other/openapi3/typescript-angular-default.yaml +++ b/bin/configs/other/openapi3/typescript-angular-default.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v2/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: "2" diff --git a/bin/configs/other/openapi3/typescript-angular-npm.yaml b/bin/configs/other/openapi3/typescript-angular-npm.yaml index 537555aab7e..4234f40f8eb 100644 --- a/bin/configs/other/openapi3/typescript-angular-npm.yaml +++ b/bin/configs/other/openapi3/typescript-angular-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v4.3/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 0.0.1 ngVersion: "4.3" diff --git a/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml b/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml index a0f7e7de655..8b5ce23861b 100644 --- a/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml +++ b/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v2/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: withInterfaces: "true" ngVersion: "2" diff --git a/bin/configs/other/openapi3/typescript-aurelia-default.yaml b/bin/configs/other/openapi3/typescript-aurelia-default.yaml index 9a8fd34ad16..070074e0f64 100644 --- a/bin/configs/other/openapi3/typescript-aurelia-default.yaml +++ b/bin/configs/other/openapi3/typescript-aurelia-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-aurelia outputDir: samples/client/petstore/typescript-aurelia/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia diff --git a/bin/configs/other/openapi3/typescript-fetch-default.yaml b/bin/configs/other/openapi3/typescript-fetch-default.yaml index d7d60dee382..3e7ffa489e8 100644 --- a/bin/configs/other/openapi3/typescript-fetch-default.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml b/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml index b62b1c17ffa..061f6290ab3 100644 --- a/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml b/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml index 9db3697aba3..3e840041de8 100644 --- a/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: withInterfaces: "true" diff --git a/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml b/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml index 337538857da..7d00832abe1 100644 --- a/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/other/openapi3/typescript-inversify.yaml b/bin/configs/other/openapi3/typescript-inversify.yaml index a7b55a50456..6e819934b68 100644 --- a/bin/configs/other/openapi3/typescript-inversify.yaml +++ b/bin/configs/other/openapi3/typescript-inversify.yaml @@ -1,3 +1,4 @@ generatorName: typescript-inversify outputDir: samples/client/petstore/typescript-inversify inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-inversify diff --git a/bin/configs/other/openapi3/typescript-jquery-default.yaml b/bin/configs/other/openapi3/typescript-jquery-default.yaml index 54c50bae2aa..70cd96bea35 100644 --- a/bin/configs/other/openapi3/typescript-jquery-default.yaml +++ b/bin/configs/other/openapi3/typescript-jquery-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery diff --git a/bin/configs/other/openapi3/typescript-jquery-npm.yaml b/bin/configs/other/openapi3/typescript-jquery-npm.yaml index fe44d227ec0..1b842c66aa6 100644 --- a/bin/configs/other/openapi3/typescript-jquery-npm.yaml +++ b/bin/configs/other/openapi3/typescript-jquery-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/jquery-typescript-petstore' diff --git a/bin/configs/other/openapi3/typescript-node-default.yaml b/bin/configs/other/openapi3/typescript-node-default.yaml index 5b43b294fad..54db17e7328 100644 --- a/bin/configs/other/openapi3/typescript-node-default.yaml +++ b/bin/configs/other/openapi3/typescript-node-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node diff --git a/bin/configs/other/openapi3/typescript-node-npm.yaml b/bin/configs/other/openapi3/typescript-node-npm.yaml index 15fdb553618..01d5cf687e5 100644 --- a/bin/configs/other/openapi3/typescript-node-npm.yaml +++ b/bin/configs/other/openapi3/typescript-node-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/angular2-typescript-petstore' diff --git a/bin/configs/other/scala-akka-http-server.yaml b/bin/configs/other/scala-akka-http-server.yaml index f4c82c9b340..5e0cbcffe66 100644 --- a/bin/configs/other/scala-akka-http-server.yaml +++ b/bin/configs/other/scala-akka-http-server.yaml @@ -1,3 +1,4 @@ generatorName: scala-akka-http-server outputDir: samples/server/petstore/scala-akka-http-server inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server diff --git a/bin/configs/perl-deep_module_test.yaml b/bin/configs/perl-deep_module_test.yaml index 7934a205a08..ea9cd53d886 100644 --- a/bin/configs/perl-deep_module_test.yaml +++ b/bin/configs/perl-deep_module_test.yaml @@ -1,6 +1,7 @@ generatorName: perl outputDir: samples/client/petstore/perl/deep_module_test inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/perl additionalProperties: moduleName: Something::Deep hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-cloud-async.yaml b/bin/configs/spring-cloud-async.yaml index 3275e4ac03e..7f087b9e0bc 100644 --- a/bin/configs/spring-cloud-async.yaml +++ b/bin/configs/spring-cloud-async.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud-async library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: async: "true" java8: "true" diff --git a/bin/configs/spring-cloud-no-nullable.yaml b/bin/configs/spring-cloud-no-nullable.yaml index 74d487b947a..498183c1958 100644 --- a/bin/configs/spring-cloud-no-nullable.yaml +++ b/bin/configs/spring-cloud-no-nullable.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud-no-nullable library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: petstore-spring-cloud-no-nullable responseWrapper: HystrixCommand diff --git a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml index de1d0567bda..366a1978822 100644 --- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml +++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml outputDir: samples/client/petstore/spring-cloud-spring-pageable -artifactId: spring-cloud-spring-pageable library: spring-cloud +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: spring-cloud-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/spring-cloud.yaml b/bin/configs/spring-cloud.yaml index 387c9e82a91..79d97acb1f2 100644 --- a/bin/configs/spring-cloud.yaml +++ b/bin/configs/spring-cloud.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: petstore-spring-cloud responseWrapper: HystrixCommand diff --git a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml index be70e14a8dc..bcb362e65db 100644 --- a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml +++ b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/spring-mvc-spring-pageable -artifactId: spring-mvc-spring-pageable library: spring-mvc +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: spring-mvc-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/spring-stubs.yaml b/bin/configs/spring-stubs.yaml index 335fdcb4a7a..8c58e6838ea 100644 --- a/bin/configs/spring-stubs.yaml +++ b/bin/configs/spring-stubs.yaml @@ -1,6 +1,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-stubs inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: spring-stubs interfaceOnly: "true" diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml index d098930671b..7e0c9882db5 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml @@ -1,10 +1,10 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8 -artifactId: springboot-spring-pageable-delegatePattern-without-j8 library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true java8: false additionalProperties: + artifactId: springboot-spring-pageable-delegatePattern-without-j8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml index 94693ac6d2b..9c96151f04f 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml @@ -1,9 +1,9 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern -artifactId: springboot-spring-pageable-delegatePattern library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true additionalProperties: + artifactId: springboot-spring-pageable-delegatePattern hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml index 757e3269513..c87a6776a5f 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml @@ -1,9 +1,9 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-without-j8 -artifactId: springboot-spring-pageable-withoutj8 library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring java8: false additionalProperties: + artifactId: springboot-spring-pageable-withoutj8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable.yaml b/bin/configs/springboot-petstore-server-spring-pageable.yaml index 7599c8099ba..ddeaaa6cb72 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable -artifactId: springboot-spring-pageable library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: springboot-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/typescript-angular-default-v6.yaml b/bin/configs/typescript-angular-default-v6.yaml index 664aa59a3c7..36e1dddbe53 100644 --- a/bin/configs/typescript-angular-default-v6.yaml +++ b/bin/configs/typescript-angular-default-v6.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 providedInRoot: "false" diff --git a/bin/configs/typescript-angular-single-request-parameter-v8.yaml b/bin/configs/typescript-angular-single-request-parameter-v8.yaml index c9978cc4aee..33b5f8c8eaf 100644 --- a/bin/configs/typescript-angular-single-request-parameter-v8.yaml +++ b/bin/configs/typescript-angular-single-request-parameter-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml index 12874213fa7..e94546bca67 100644 --- a/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 10.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v10-provided-in-root.yaml b/bin/configs/typescript-angular-v10-provided-in-root.yaml index 3f8a062cb6a..65a195cb466 100644 --- a/bin/configs/typescript-angular-v10-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v10-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 10.0.0 diff --git a/bin/configs/typescript-angular-v11-oneOf.yaml b/bin/configs/typescript-angular-v11-oneOf.yaml index e9d83262ac8..e86a596865c 100644 --- a/bin/configs/typescript-angular-v11-oneOf.yaml +++ b/bin/configs/typescript-angular-v11-oneOf.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-oneOf/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 diff --git a/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml index c8bbd6e467c..7e3bcbbf3cb 100644 --- a/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v11-provided-in-root.yaml b/bin/configs/typescript-angular-v11-provided-in-root.yaml index ec3923714cc..a25b4cbe326 100644 --- a/bin/configs/typescript-angular-v11-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v11-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 diff --git a/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml index 8bb13b8eac7..2c6eee28164 100644 --- a/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v6-provided-in-root.yaml b/bin/configs/typescript-angular-v6-provided-in-root.yaml index 36680054672..6fa069cbacf 100644 --- a/bin/configs/typescript-angular-v6-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v6-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 diff --git a/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml index ac73ad65f91..2584cf26cd9 100644 --- a/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v7-not-provided-in-root.yaml b/bin/configs/typescript-angular-v7-not-provided-in-root.yaml index 83d16bcefb1..80d844f912b 100644 --- a/bin/configs/typescript-angular-v7-not-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v7-not-provided-in-root.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 providedInRoot: "false" \ No newline at end of file diff --git a/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml index 6ae7f19ad42..97ab93f8b41 100644 --- a/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v7-provided-in-root.yaml b/bin/configs/typescript-angular-v7-provided-in-root.yaml index 5a22f83d84a..9b051d4d3b7 100644 --- a/bin/configs/typescript-angular-v7-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v7-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 diff --git a/bin/configs/typescript-angular-v9-provided-in-any.yaml b/bin/configs/typescript-angular-v9-provided-in-any.yaml index 6678f7bb2ec..22bee99305f 100644 --- a/bin/configs/typescript-angular-v9-provided-in-any.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-any.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 providedIn: any diff --git a/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml index 7a0b1c3df77..df3775b9dd9 100644 --- a/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v9-provided-in-root.yaml b/bin/configs/typescript-angular-v9-provided-in-root.yaml index 1bcdebaf797..f32176dc72d 100644 --- a/bin/configs/typescript-angular-v9-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 diff --git a/bin/configs/typescript-angular-with-npm-v6.yaml b/bin/configs/typescript-angular-with-npm-v6.yaml index c8bcfc48892..450c9282cf7 100644 --- a/bin/configs/typescript-angular-with-npm-v6.yaml +++ b/bin/configs/typescript-angular-with-npm-v6.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 6.0.0 diff --git a/bin/configs/typescript-angular-with-npm-v8.yaml b/bin/configs/typescript-angular-with-npm-v8.yaml index 48849517fcc..bdbd3a156d2 100644 --- a/bin/configs/typescript-angular-with-npm-v8.yaml +++ b/bin/configs/typescript-angular-with-npm-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml b/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml index d0c0e1cd0b7..d288257a200 100644 --- a/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml +++ b/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-aurelia-default.yaml b/bin/configs/typescript-aurelia-default.yaml index c0b70a6ad9a..1d93065379c 100644 --- a/bin/configs/typescript-aurelia-default.yaml +++ b/bin/configs/typescript-aurelia-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-aurelia outputDir: samples/client/petstore/typescript-aurelia/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia diff --git a/bin/configs/typescript-axios-composed-schemas.yaml b/bin/configs/typescript-axios-composed-schemas.yaml index c9bea94bbad..cb51a976cbf 100644 --- a/bin/configs/typescript-axios-composed-schemas.yaml +++ b/bin/configs/typescript-axios-composed-schemas.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/composed-schemas inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-default.yaml b/bin/configs/typescript-axios-default.yaml index 5b3c9488a88..8f04fba8c70 100644 --- a/bin/configs/typescript-axios-default.yaml +++ b/bin/configs/typescript-axios-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-es6-target.yaml b/bin/configs/typescript-axios-es6-target.yaml index 79b61fdaff0..06ff80e7249 100644 --- a/bin/configs/typescript-axios-es6-target.yaml +++ b/bin/configs/typescript-axios-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-axios-with-complex-headers.yaml b/bin/configs/typescript-axios-with-complex-headers.yaml index c88e7a15d82..e4eeee792ad 100644 --- a/bin/configs/typescript-axios-with-complex-headers.yaml +++ b/bin/configs/typescript-axios-with-complex-headers.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-complex-headers inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 1cb364d79ea..65e913fc06e 100644 --- a/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-with-interfaces.yaml b/bin/configs/typescript-axios-with-interfaces.yaml index 11337d00353..a1d792a5c2a 100644 --- a/bin/configs/typescript-axios-with-interfaces.yaml +++ b/bin/configs/typescript-axios-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: withInterfaces: "true" diff --git a/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml b/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml index 48186cc0629..5967dd11e1c 100644 --- a/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml +++ b/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 apiPackage: api.another.level diff --git a/bin/configs/typescript-axios-with-npm-version.yaml b/bin/configs/typescript-axios-with-npm-version.yaml index 8602cac04dd..af18edee14f 100644 --- a/bin/configs/typescript-axios-with-npm-version.yaml +++ b/bin/configs/typescript-axios-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-axios-petstore' diff --git a/bin/configs/typescript-axios-with-single-request-parameters.yaml b/bin/configs/typescript-axios-with-single-request-parameters.yaml index 9239c632938..a06f70ebd6c 100644 --- a/bin/configs/typescript-axios-with-single-request-parameters.yaml +++ b/bin/configs/typescript-axios-with-single-request-parameters.yaml @@ -1,5 +1,6 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-single-request-parameters inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: useSingleRequestParameter: "true" diff --git a/bin/configs/typescript-consolidated-deno.yaml b/bin/configs/typescript-consolidated-deno.yaml index 67fdb69573d..c3a50488412 100644 --- a/bin/configs/typescript-consolidated-deno.yaml +++ b/bin/configs/typescript-consolidated-deno.yaml @@ -1,6 +1,7 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/deno inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: deno npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-inversify.yaml b/bin/configs/typescript-consolidated-inversify.yaml index 70277c6e7ad..d0cb671916e 100644 --- a/bin/configs/typescript-consolidated-inversify.yaml +++ b/bin/configs/typescript-consolidated-inversify.yaml @@ -1,6 +1,7 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/inversify inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-jquery.yaml b/bin/configs/typescript-consolidated-jquery.yaml index 2a9e79af1b2..66aeeea4d1b 100644 --- a/bin/configs/typescript-consolidated-jquery.yaml +++ b/bin/configs/typescript-consolidated-jquery.yaml @@ -1,6 +1,7 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/jquery inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: framework: jquery npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-node-object-parameters.yaml b/bin/configs/typescript-consolidated-node-object-parameters.yaml index 40171df194d..2558d478d8d 100644 --- a/bin/configs/typescript-consolidated-node-object-parameters.yaml +++ b/bin/configs/typescript-consolidated-node-object-parameters.yaml @@ -1,6 +1,7 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/object_params inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-node.yaml b/bin/configs/typescript-consolidated-node.yaml index 137a5242ed9..dae434ea2aa 100644 --- a/bin/configs/typescript-consolidated-node.yaml +++ b/bin/configs/typescript-consolidated-node.yaml @@ -1,6 +1,7 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client diff --git a/bin/configs/typescript-fetch-default-v3.0.yaml b/bin/configs/typescript-fetch-default-v3.0.yaml index 6baf7b2b260..1fbde1d4a43 100644 --- a/bin/configs/typescript-fetch-default-v3.0.yaml +++ b/bin/configs/typescript-fetch-default-v3.0.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default-v3.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-default.yaml b/bin/configs/typescript-fetch-default.yaml index 85301d86bb9..1a61fc45e01 100644 --- a/bin/configs/typescript-fetch-default.yaml +++ b/bin/configs/typescript-fetch-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-enum.yaml b/bin/configs/typescript-fetch-enum.yaml index 7cac26e381a..609b45160fa 100644 --- a/bin/configs/typescript-fetch-enum.yaml +++ b/bin/configs/typescript-fetch-enum.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/enum inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-es6-target.yaml b/bin/configs/typescript-fetch-es6-target.yaml index aea1ad31848..929fd29d1ce 100644 --- a/bin/configs/typescript-fetch-es6-target.yaml +++ b/bin/configs/typescript-fetch-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-fetch-multiple-parameters.yaml b/bin/configs/typescript-fetch-multiple-parameters.yaml index 0bc52605c27..c0711f3baba 100644 --- a/bin/configs/typescript-fetch-multiple-parameters.yaml +++ b/bin/configs/typescript-fetch-multiple-parameters.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/multiple-parameters inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: useSingleRequestParameter: false snapshot: false diff --git a/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml b/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml index 27334256aad..ccb7b51eb7a 100644 --- a/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml +++ b/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-sagas-and-records.yaml b/bin/configs/typescript-fetch-sagas-and-records.yaml index a9fbe6136c7..1f8a48d4ea2 100644 --- a/bin/configs/typescript-fetch-sagas-and-records.yaml +++ b/bin/configs/typescript-fetch-sagas-and-records.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/sagas-and-records inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-typescript-three-plus.yaml b/bin/configs/typescript-fetch-typescript-three-plus.yaml index a18d0d8adbc..f6f3c5ac7bc 100644 --- a/bin/configs/typescript-fetch-typescript-three-plus.yaml +++ b/bin/configs/typescript-fetch-typescript-three-plus.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/typescript-three-plus inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-with-interfaces.yaml b/bin/configs/typescript-fetch-with-interfaces.yaml index e0e84f57d12..926edb431d9 100644 --- a/bin/configs/typescript-fetch-with-interfaces.yaml +++ b/bin/configs/typescript-fetch-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: withInterfaces: "true" diff --git a/bin/configs/typescript-fetch-with-npm-version.yaml b/bin/configs/typescript-fetch-with-npm-version.yaml index 35e2c2a2d3c..cd669c5e0d2 100644 --- a/bin/configs/typescript-fetch-with-npm-version.yaml +++ b/bin/configs/typescript-fetch-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-without-runtime-checks.yaml b/bin/configs/typescript-fetch-without-runtime-checks.yaml index 15505a8986e..75b9744fd34 100644 --- a/bin/configs/typescript-fetch-without-runtime-checks.yaml +++ b/bin/configs/typescript-fetch-without-runtime-checks.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/without-runtime-checks inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-inversify.yaml b/bin/configs/typescript-inversify.yaml index de2fe10c96b..5c18d8533f8 100644 --- a/bin/configs/typescript-inversify.yaml +++ b/bin/configs/typescript-inversify.yaml @@ -1,3 +1,4 @@ generatorName: typescript-inversify outputDir: samples/client/petstore/typescript-inversify inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-inversify diff --git a/bin/configs/typescript-jquery-default.yaml b/bin/configs/typescript-jquery-default.yaml index 77758d8e45a..088647a8adc 100644 --- a/bin/configs/typescript-jquery-default.yaml +++ b/bin/configs/typescript-jquery-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery diff --git a/bin/configs/typescript-jquery-npm.yaml b/bin/configs/typescript-jquery-npm.yaml index a0e53ec13ed..387da120f3f 100644 --- a/bin/configs/typescript-jquery-npm.yaml +++ b/bin/configs/typescript-jquery-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/jquery-typescript-petstore' diff --git a/bin/configs/typescript-node-default.yaml b/bin/configs/typescript-node-default.yaml index 0b7bcafa077..bdd6eea3cb5 100644 --- a/bin/configs/typescript-node-default.yaml +++ b/bin/configs/typescript-node-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node diff --git a/bin/configs/typescript-node-npm.yaml b/bin/configs/typescript-node-npm.yaml index 06dafcad370..b61450c0671 100644 --- a/bin/configs/typescript-node-npm.yaml +++ b/bin/configs/typescript-node-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/node-typescript-petstore' diff --git a/bin/configs/typescript-rxjs-default.yaml b/bin/configs/typescript-rxjs-default.yaml index e2006a1ab3e..9c68513400d 100644 --- a/bin/configs/typescript-rxjs-default.yaml +++ b/bin/configs/typescript-rxjs-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs diff --git a/bin/configs/typescript-rxjs-es6-target.yaml b/bin/configs/typescript-rxjs-es6-target.yaml index cb40131cee4..4889de95854 100644 --- a/bin/configs/typescript-rxjs-es6-target.yaml +++ b/bin/configs/typescript-rxjs-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-rxjs-with-npm-version.yaml b/bin/configs/typescript-rxjs-with-npm-version.yaml index 4d2fd37f8f6..6b528e60d87 100644 --- a/bin/configs/typescript-rxjs-with-npm-version.yaml +++ b/bin/configs/typescript-rxjs-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-rxjs-petstore' diff --git a/bin/configs/typescript-rxjs-with-progress-subscriber.yaml b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml index f20df704bec..b33f917ca44 100644 --- a/bin/configs/typescript-rxjs-with-progress-subscriber.yaml +++ b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml @@ -1,5 +1,6 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: withProgressSubscriber: "true" From 831034bb244c2a4b9eced2b5a6e9f4faabec0d6b Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 31 Jul 2021 08:19:44 -0500 Subject: [PATCH 13/72] Move the JsonbProperty annotation from the getter to the field declaration (#10035) Co-authored-by: Mike Anderson --- .../resources/Java/libraries/microprofile/pojo.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache index a457e531d6e..183b60cc1ac 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache @@ -46,6 +46,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ * {{{description}}} **/ {{/description}} + {{^withXml}} + @JsonbProperty("{{baseName}}") + {{/withXml}} {{#isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; {{/isContainer}} @@ -76,9 +79,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ {{#deprecated}} @Deprecated {{/deprecated}} - {{^withXml}} - @JsonbProperty("{{baseName}}") - {{/withXml}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} From 70982ddc759e4f76f4fb0f4d58e298046a076004 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 31 Jul 2021 21:28:10 +0800 Subject: [PATCH 14/72] update samples --- .../org/openapitools/client/model/Category.java | 4 ++-- .../client/model/ModelApiResponse.java | 6 +++--- .../org/openapitools/client/model/Order.java | 12 ++++++------ .../java/org/openapitools/client/model/Pet.java | 12 ++++++------ .../java/org/openapitools/client/model/Tag.java | 4 ++-- .../java/org/openapitools/client/model/User.java | 16 ++++++++-------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java index 175f05a9385..f733b6a1d8c 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java @@ -30,15 +30,16 @@ import javax.json.bind.annotation.JsonbProperty; public class Category { + @JsonbProperty("id") private Long id; + @JsonbProperty("name") private String name; /** * Get id * @return id **/ - @JsonbProperty("id") public Long getId() { return id; } @@ -59,7 +60,6 @@ public class Category { * Get name * @return name **/ - @JsonbProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java index dbacf1b3c33..b1e11cad8b1 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -30,17 +30,19 @@ import javax.json.bind.annotation.JsonbProperty; public class ModelApiResponse { + @JsonbProperty("code") private Integer code; + @JsonbProperty("type") private String type; + @JsonbProperty("message") private String message; /** * Get code * @return code **/ - @JsonbProperty("code") public Integer getCode() { return code; } @@ -61,7 +63,6 @@ public class ModelApiResponse { * Get type * @return type **/ - @JsonbProperty("type") public String getType() { return type; } @@ -82,7 +83,6 @@ public class ModelApiResponse { * Get message * @return message **/ - @JsonbProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java index c55d98c6d66..2393fe6ac12 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java @@ -31,12 +31,16 @@ import javax.json.bind.annotation.JsonbProperty; public class Order { + @JsonbProperty("id") private Long id; + @JsonbProperty("petId") private Long petId; + @JsonbProperty("quantity") private Integer quantity; + @JsonbProperty("shipDate") private Date shipDate; @JsonbTypeSerializer(StatusEnum.Serializer.class) @@ -84,15 +88,16 @@ public class Order { /** * Order Status **/ + @JsonbProperty("status") private StatusEnum status; + @JsonbProperty("complete") private Boolean complete = false; /** * Get id * @return id **/ - @JsonbProperty("id") public Long getId() { return id; } @@ -113,7 +118,6 @@ public class Order { * Get petId * @return petId **/ - @JsonbProperty("petId") public Long getPetId() { return petId; } @@ -134,7 +138,6 @@ public class Order { * Get quantity * @return quantity **/ - @JsonbProperty("quantity") public Integer getQuantity() { return quantity; } @@ -155,7 +158,6 @@ public class Order { * Get shipDate * @return shipDate **/ - @JsonbProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -176,7 +178,6 @@ public class Order { * Order Status * @return status **/ - @JsonbProperty("status") public StatusEnum getStatus() { return status; } @@ -197,7 +198,6 @@ public class Order { * Get complete * @return complete **/ - @JsonbProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java index d828105ec48..ea61ea0fba9 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java @@ -34,14 +34,19 @@ import javax.json.bind.annotation.JsonbProperty; public class Pet { + @JsonbProperty("id") private Long id; + @JsonbProperty("category") private Category category; + @JsonbProperty("name") private String name; + @JsonbProperty("photoUrls") private List photoUrls = new ArrayList(); + @JsonbProperty("tags") private List tags = null; @JsonbTypeSerializer(StatusEnum.Serializer.class) @@ -89,13 +94,13 @@ public class Pet { /** * pet status in the store **/ + @JsonbProperty("status") private StatusEnum status; /** * Get id * @return id **/ - @JsonbProperty("id") public Long getId() { return id; } @@ -116,7 +121,6 @@ public class Pet { * Get category * @return category **/ - @JsonbProperty("category") public Category getCategory() { return category; } @@ -137,7 +141,6 @@ public class Pet { * Get name * @return name **/ - @JsonbProperty("name") public String getName() { return name; } @@ -158,7 +161,6 @@ public class Pet { * Get photoUrls * @return photoUrls **/ - @JsonbProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -184,7 +186,6 @@ public class Pet { * Get tags * @return tags **/ - @JsonbProperty("tags") public List getTags() { return tags; } @@ -210,7 +211,6 @@ public class Pet { * pet status in the store * @return status **/ - @JsonbProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java index 66b13902a4b..1a5330676cc 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java @@ -30,15 +30,16 @@ import javax.json.bind.annotation.JsonbProperty; public class Tag { + @JsonbProperty("id") private Long id; + @JsonbProperty("name") private String name; /** * Get id * @return id **/ - @JsonbProperty("id") public Long getId() { return id; } @@ -59,7 +60,6 @@ public class Tag { * Get name * @return name **/ - @JsonbProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java index 93190e51a9e..6552a7a7fd1 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java @@ -30,30 +30,37 @@ import javax.json.bind.annotation.JsonbProperty; public class User { + @JsonbProperty("id") private Long id; + @JsonbProperty("username") private String username; + @JsonbProperty("firstName") private String firstName; + @JsonbProperty("lastName") private String lastName; + @JsonbProperty("email") private String email; + @JsonbProperty("password") private String password; + @JsonbProperty("phone") private String phone; /** * User Status **/ + @JsonbProperty("userStatus") private Integer userStatus; /** * Get id * @return id **/ - @JsonbProperty("id") public Long getId() { return id; } @@ -74,7 +81,6 @@ public class User { * Get username * @return username **/ - @JsonbProperty("username") public String getUsername() { return username; } @@ -95,7 +101,6 @@ public class User { * Get firstName * @return firstName **/ - @JsonbProperty("firstName") public String getFirstName() { return firstName; } @@ -116,7 +121,6 @@ public class User { * Get lastName * @return lastName **/ - @JsonbProperty("lastName") public String getLastName() { return lastName; } @@ -137,7 +141,6 @@ public class User { * Get email * @return email **/ - @JsonbProperty("email") public String getEmail() { return email; } @@ -158,7 +161,6 @@ public class User { * Get password * @return password **/ - @JsonbProperty("password") public String getPassword() { return password; } @@ -179,7 +181,6 @@ public class User { * Get phone * @return phone **/ - @JsonbProperty("phone") public String getPhone() { return phone; } @@ -200,7 +201,6 @@ public class User { * User Status * @return userStatus **/ - @JsonbProperty("userStatus") public Integer getUserStatus() { return userStatus; } From fc28661dde9196159cdda724eec8f8bbb7a67494 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 2 Aug 2021 00:19:05 +0800 Subject: [PATCH 15/72] add AnyType support to Kotlin (#10070) --- .../openapitools/codegen/languages/AbstractKotlinCodegen.java | 1 + 1 file changed, 1 insertion(+) 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 c44fa068aa1..60ad7a12f7d 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 @@ -170,6 +170,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co typeMapping.put("binary", "kotlin.ByteArray"); typeMapping.put("Date", "java.time.LocalDate"); typeMapping.put("DateTime", "java.time.OffsetDateTime"); + typeMapping.put("AnyType", "kotlin.Any"); instantiationTypes.put("array", "kotlin.collections.ArrayList"); instantiationTypes.put("list", "kotlin.collections.ArrayList"); From e5ce66aae6f34e85377ad0d914603ada846a5fb3 Mon Sep 17 00:00:00 2001 From: Ghufran Zahidi <18732053+Ghufz@users.noreply.github.com> Date: Mon, 2 Aug 2021 09:05:00 +0530 Subject: [PATCH 16/72] [csharp-netcore]Model's FromJson method check for jsonstring is not nullOrEmpty before deserializing (#10060) * check for jsonstring is not nullOrEmpty before desrializing for oneOf and anyOf * update samples Co-authored-by: William Cheng --- .../src/main/resources/csharp-netcore/modelAnyOf.mustache | 2 +- .../src/main/resources/csharp-netcore/modelOneOf.mustache | 2 +- .../src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../src/Org.OpenAPITools/Model/Triangle.cs | 2 +- .../src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../src/Org.OpenAPITools/Model/Triangle.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableShape.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs | 2 +- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache index 931f7646da8..c1b96657ae0 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache @@ -100,7 +100,7 @@ { {{classname}} new{{classname}} = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return new{{classname}}; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache index d2d6e28b3f9..59e2dbf19eb 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache @@ -100,7 +100,7 @@ { {{classname}} new{{classname}} = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return new{{classname}}; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs index 66de6a1c6f1..2c943a19d85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs index 488c489d73a..21ca382a600 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs index 1aaa59d3f8b..e4e07b3a757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs index ed940d7ab6f..ead3f0af66c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs index 20be30e5b89..636cdca0651 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs index 967d2139a0a..67bfc7ca975 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs index 19bc98ed2ec..b3c86d926a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs index f17c4d9a8f5..b2514c59c45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs index df321dc9e81..0573212d997 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs index 6f33859a898..fcb3c54f3cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs index 6c0b8d06cfa..1f6f87d3529 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs index 207a851e23f..c0272bbb8cb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs index 49a39c4747e..b82cb1589f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs index fb62820cbd2..156ca7681a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs @@ -166,7 +166,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs index bb16eee3501..00080899300 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs index 715aeb7327f..948cdbd5f50 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs index 7a2c6e8c98e..b3195745889 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs index 9afe7ae6564..b6bd3cb1963 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs index b39f95e0be1..eb9c49ed5e1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs index df5cae1e14f..d4ec8d72d1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs @@ -166,7 +166,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs index 66de6a1c6f1..2c943a19d85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs index 488c489d73a..21ca382a600 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs index 1aaa59d3f8b..e4e07b3a757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs index ed940d7ab6f..ead3f0af66c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs index 20be30e5b89..636cdca0651 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs index 967d2139a0a..67bfc7ca975 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs index 19bc98ed2ec..b3c86d926a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs index f17c4d9a8f5..b2514c59c45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs index df321dc9e81..0573212d997 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs index 6f33859a898..fcb3c54f3cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs index 66de6a1c6f1..2c943a19d85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs index 488c489d73a..21ca382a600 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs index 1aaa59d3f8b..e4e07b3a757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs index ed940d7ab6f..ead3f0af66c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs index 20be30e5b89..636cdca0651 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs index 967d2139a0a..67bfc7ca975 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index 19bc98ed2ec..b3c86d926a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs index f17c4d9a8f5..b2514c59c45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index df321dc9e81..0573212d997 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs index 6f33859a898..fcb3c54f3cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs index 66de6a1c6f1..2c943a19d85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs index 488c489d73a..21ca382a600 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs index 1aaa59d3f8b..e4e07b3a757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs index ed940d7ab6f..ead3f0af66c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs index 20be30e5b89..636cdca0651 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs index 967d2139a0a..67bfc7ca975 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs index 19bc98ed2ec..b3c86d926a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs index f17c4d9a8f5..b2514c59c45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs index df321dc9e81..0573212d997 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs index 6f33859a898..fcb3c54f3cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs index 66de6a1c6f1..2c943a19d85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model { Fruit newFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs index 488c489d73a..21ca382a600 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model { FruitReq newFruitReq = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newFruitReq; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs index 1aaa59d3f8b..e4e07b3a757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { GmFruit newGmFruit = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newGmFruit; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs index 845bc54a3cb..0aa6d042675 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Mammal newMammal = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newMammal; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs index 5f454dee6d3..4bd840d8888 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { NullableShape newNullableShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newNullableShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs index 34e2e4de83c..61cd46bcd16 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Pig newPig = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newPig; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs index 1e00244d163..a8be402e3d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Quadrilateral newQuadrilateral = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newQuadrilateral; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs index a71a14456e6..1b0d8a9ebe9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { Shape newShape = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShape; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs index f7c4541f236..8e281ca9edd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model { ShapeOrNull newShapeOrNull = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newShapeOrNull; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs index 0b1b3902702..e3a515568b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model { Triangle newTriangle = null; - if (jsonString == null) + if (string.IsNullOrEmpty(jsonString)) { return newTriangle; } From e39e4bcd6edf72c53ec265b8034a7cda3a2647b2 Mon Sep 17 00:00:00 2001 From: Noor Dawod Date: Mon, 2 Aug 2021 11:38:22 +0200 Subject: [PATCH 17/72] Kotlin client/spacings indentations (#9853) * Bump jimschubert/query-tag-action from 1 to 2 Bumps [jimschubert/query-tag-action](https://github.com/jimschubert/query-tag-action) from 1 to 2. - [Release notes](https://github.com/jimschubert/query-tag-action/releases) - [Commits](https://github.com/jimschubert/query-tag-action/compare/v1...v2) Signed-off-by: dependabot[bot] * Adjust spacings, bring back suppresses to silence IntelliJ IDEs. * Suppress few warnings since we know we are using them in the code. * toLowerCase() is deprecated. * Wrap enum values in backticks to guard against reserved names, bring back encode/decode for each enum. * Wrap property names in backticks to guard against reserved names. * Regenerate samples. * Do not warn about unused imports. * Regenerate samples. * Updated petstore code. * Add missing reserved Kotlin operators and special keywords. * Revert adding backticks. * Regenerate pet store shop code. * Remove unused suppression. * Use 3 braces to wrap name. * Regenerate pet store shop code. * Remove get from reserved words. * Revert back removal of description. * Regenerate source code for Petstore. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../workflows/docker-tag-latest-release.yml | 2 +- docs/generators/kotlin-server-deprecated.md | 39 +++++++++++ docs/generators/kotlin-server.md | 39 +++++++++++ docs/generators/kotlin-spring.md | 39 +++++++++++ docs/generators/kotlin-vertx.md | 39 +++++++++++ docs/generators/kotlin.md | 39 +++++++++++ .../languages/AbstractKotlinCodegen.java | 49 ++++++++++++-- .../kotlin-client/data_class.mustache | 4 ++ .../kotlin-client/data_class_req_var.mustache | 2 +- .../kotlin-client/enum_class.mustache | 40 +++++++---- .../auth/HttpBearerAuth.kt.mustache | 2 +- .../kotlin-client/licenseInfo.mustache | 28 +++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../src/commonTest/kotlin/util/Coroutine.kt | 29 +++++--- .../src/iosTest/kotlin/util/Coroutine.kt | 29 +++++--- .../src/jvmTest/kotlin/util/Coroutine.kt | 29 +++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- .../org/openapitools/client/apis/EnumApi.kt | 29 +++++--- .../org/openapitools/client/models/PetEnum.kt | 67 +++++++++++++------ .../org/openapitools/client/apis/PetApi.kt | 29 +++++--- .../org/openapitools/client/apis/StoreApi.kt | 29 +++++--- .../org/openapitools/client/apis/UserApi.kt | 29 +++++--- .../openapitools/client/models/ApiResponse.kt | 34 +++++++--- .../openapitools/client/models/Category.kt | 33 ++++++--- .../org/openapitools/client/models/Order.kt | 38 ++++++++--- .../org/openapitools/client/models/Pet.kt | 38 ++++++++--- .../org/openapitools/client/models/Tag.kt | 33 ++++++--- .../org/openapitools/client/models/User.kt | 39 ++++++++--- 143 files changed, 3423 insertions(+), 1351 deletions(-) diff --git a/.github/workflows/docker-tag-latest-release.yml b/.github/workflows/docker-tag-latest-release.yml index d380cacbe83..a871f36cead 100644 --- a/.github/workflows/docker-tag-latest-release.yml +++ b/.github/workflows/docker-tag-latest-release.yml @@ -19,7 +19,7 @@ jobs: # This action will "unshallow" so we have all tag info - name: Get latest tag id: tagger - uses: jimschubert/query-tag-action@v1 + uses: jimschubert/query-tag-action@v2 with: include: 'v*' exclude: '*-rc*' diff --git a/docs/generators/kotlin-server-deprecated.md b/docs/generators/kotlin-server-deprecated.md index 778b13ee7b3..2287e954abf 100644 --- a/docs/generators/kotlin-server-deprecated.md +++ b/docs/generators/kotlin-server-deprecated.md @@ -74,28 +74,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl ## RESERVED WORDS

    +
  • abstract
    • +
  • actual
    • +
  • annotation
  • as
  • break
  • class
    • +
  • companion
    • +
  • const
    • +
  • constructor
  • continue
    • +
  • crossinline
    • +
  • data
    • +
  • delegate
  • do
    • +
  • dynamic
  • else
    • +
  • enum
    • +
  • expect
  • external
  • false
    • +
  • field
    • +
  • final
    • +
  • finally
  • for
  • fun
  • if
    • +
  • import
  • in
    • +
  • infix
    • +
  • init
    • +
  • inline
    • +
  • inner
  • interface
  • internal
  • is
    • +
  • it
    • +
  • lateinit
    • +
  • noinline
  • null
  • object
  • open
    • +
  • operator
    • +
  • out
    • +
  • override
  • package
    • +
  • param
  • private
    • +
  • property
    • +
  • protected
    • +
  • public
    • +
  • receiver
    • +
  • reified
  • return
    • +
  • sealed
    • +
  • setparam
  • super
    • +
  • suspend
    • +
  • tailrec
  • this
  • throw
  • true
    • @@ -103,8 +139,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • typealias
  • typeof
  • val
    • +
  • value
  • var
    • +
  • vararg
  • when
    • +
  • where
  • while
diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md index f6e6c260343..81f75ca5785 100644 --- a/docs/generators/kotlin-server.md +++ b/docs/generators/kotlin-server.md @@ -76,28 +76,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl ## RESERVED WORDS
    +
  • abstract
    • +
  • actual
    • +
  • annotation
  • as
  • break
  • class
    • +
  • companion
    • +
  • const
    • +
  • constructor
  • continue
    • +
  • crossinline
    • +
  • data
    • +
  • delegate
  • do
    • +
  • dynamic
  • else
    • +
  • enum
    • +
  • expect
  • external
  • false
    • +
  • field
    • +
  • final
    • +
  • finally
  • for
  • fun
  • if
    • +
  • import
  • in
    • +
  • infix
    • +
  • init
    • +
  • inline
    • +
  • inner
  • interface
  • internal
  • is
    • +
  • it
    • +
  • lateinit
    • +
  • noinline
  • null
  • object
  • open
    • +
  • operator
    • +
  • out
    • +
  • override
  • package
    • +
  • param
  • private
    • +
  • property
    • +
  • protected
    • +
  • public
    • +
  • receiver
    • +
  • reified
  • return
    • +
  • sealed
    • +
  • setparam
  • super
    • +
  • suspend
    • +
  • tailrec
  • this
  • throw
  • true
    • @@ -105,8 +141,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • typealias
  • typeof
  • val
    • +
  • value
  • var
    • +
  • vararg
  • when
    • +
  • where
  • while
diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 58152432964..5cd67ff64aa 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -87,28 +87,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • ApiClient
  • ApiException
  • ApiResponse
    • +
  • abstract
    • +
  • actual
    • +
  • annotation
  • as
  • break
  • class
    • +
  • companion
    • +
  • const
    • +
  • constructor
  • continue
    • +
  • crossinline
    • +
  • data
    • +
  • delegate
  • do
    • +
  • dynamic
  • else
    • +
  • enum
    • +
  • expect
  • external
  • false
    • +
  • field
    • +
  • final
    • +
  • finally
  • for
  • fun
  • if
    • +
  • import
  • in
    • +
  • infix
    • +
  • init
    • +
  • inline
    • +
  • inner
  • interface
  • internal
  • is
    • +
  • it
    • +
  • lateinit
    • +
  • noinline
  • null
  • object
  • open
    • +
  • operator
    • +
  • out
    • +
  • override
  • package
    • +
  • param
  • private
    • +
  • property
    • +
  • protected
    • +
  • public
    • +
  • receiver
    • +
  • reified
  • return
    • +
  • sealed
    • +
  • setparam
  • super
    • +
  • suspend
    • +
  • tailrec
  • this
  • throw
  • true
    • @@ -116,8 +152,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • typealias
  • typeof
  • val
    • +
  • value
  • var
    • +
  • vararg
  • when
    • +
  • where
  • while
    • diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md index 246ffa62a64..90afde4de81 100644 --- a/docs/generators/kotlin-vertx.md +++ b/docs/generators/kotlin-vertx.md @@ -68,28 +68,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl ## RESERVED WORDS
      +
    • abstract
      • +
    • actual
      • +
    • annotation
    • as
    • break
    • class
      • +
    • companion
      • +
    • const
      • +
    • constructor
    • continue
      • +
    • crossinline
      • +
    • data
      • +
    • delegate
    • do
      • +
    • dynamic
    • else
      • +
    • enum
      • +
    • expect
    • external
    • false
      • +
    • field
      • +
    • final
      • +
    • finally
    • for
    • fun
    • if
      • +
    • import
    • in
      • +
    • infix
      • +
    • init
      • +
    • inline
      • +
    • inner
    • interface
    • internal
    • is
      • +
    • it
      • +
    • lateinit
      • +
    • noinline
    • null
    • object
    • open
      • +
    • operator
      • +
    • out
      • +
    • override
    • package
      • +
    • param
    • private
      • +
    • property
      • +
    • protected
      • +
    • public
      • +
    • receiver
      • +
    • reified
    • return
      • +
    • sealed
      • +
    • setparam
    • super
      • +
    • suspend
      • +
    • tailrec
    • this
    • throw
    • true
      • @@ -97,8 +133,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
    • typealias
    • typeof
    • val
      • +
    • value
    • var
      • +
    • vararg
    • when
      • +
    • where
    • while
    diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md index 8f853b41cac..089db56e616 100644 --- a/docs/generators/kotlin.md +++ b/docs/generators/kotlin.md @@ -78,28 +78,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl ## RESERVED WORDS
      +
    • abstract
      • +
    • actual
      • +
    • annotation
    • as
    • break
    • class
      • +
    • companion
      • +
    • const
      • +
    • constructor
    • continue
      • +
    • crossinline
      • +
    • data
      • +
    • delegate
    • do
      • +
    • dynamic
    • else
      • +
    • enum
      • +
    • expect
    • external
    • false
      • +
    • field
      • +
    • final
      • +
    • finally
    • for
    • fun
    • if
      • +
    • import
    • in
      • +
    • infix
      • +
    • init
      • +
    • inline
      • +
    • inner
    • interface
    • internal
    • is
      • +
    • it
      • +
    • lateinit
      • +
    • noinline
    • null
    • object
    • open
      • +
    • operator
      • +
    • out
      • +
    • override
    • package
      • +
    • param
    • private
      • +
    • property
      • +
    • protected
      • +
    • public
      • +
    • receiver
      • +
    • reified
    • return
      • +
    • sealed
      • +
    • setparam
    • super
      • +
    • suspend
      • +
    • tailrec
    • this
    • throw
    • true
      • @@ -107,8 +143,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
    • typealias
    • typeof
    • val
      • +
    • value
    • var
      • +
    • vararg
    • when
      • +
    • where
    • while
    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 60ad7a12f7d..bc6c0079358 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 @@ -99,24 +99,64 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co // this includes hard reserved words defined by https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java // as well as keywords from https://kotlinlang.org/docs/reference/keyword-reference.html reservedWords = new HashSet(Arrays.asList( + "abstract", + "actual", + "annotation", "as", "break", "class", + "companion", + "const", + "constructor", "continue", + "crossinline", + "data", + "delegate", "do", + "dynamic", "else", + "enum", + "expect", + "external", "false", + "field", + "final", + "finally", "for", "fun", "if", + "import", "in", + "infix", + "init", + "inline", + "inner", "interface", + "internal", "is", + "it", + "lateinit", + "noinline", "null", "object", + "open", + "operator", + "out", + "override", "package", + "param", + "private", + "property", + "protected", + "public", + "receiver", + "reified", "return", + "sealed", + "setparam", "super", + "suspend", + "tailrec", "this", "throw", "true", @@ -124,13 +164,12 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co "typealias", "typeof", "val", + "value", "var", + "vararg", "when", - "while", - "private", - "open", - "external", - "internal" + "where", + "while" )); defaultIncludes = new HashSet(Arrays.asList( diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache index 093d3031839..3cc72993e61 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache @@ -38,6 +38,7 @@ import java.io.Serializable /** * {{{description}}} + * {{#allVars}} * @param {{{name}}} {{{description}}} {{/allVars}} @@ -50,8 +51,10 @@ import java.io.Serializable @Deprecated(message = "This schema is deprecated.") {{/isDeprecated}} {{#nonPublicApi}}internal {{/nonPublicApi}}{{#discriminator}}interface{{/discriminator}}{{^discriminator}}data class{{/discriminator}} {{classname}}{{^discriminator}} ( + {{#allVars}} {{#required}}{{>data_class_req_var}}{{/required}}{{^required}}{{>data_class_opt_var}}{{/required}}{{^-last}},{{/-last}} + {{/allVars}} ){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} { {{/vendorExtensions.x-has-data-class-body}} @@ -68,6 +71,7 @@ import java.io.Serializable {{#isEnum}} /** * {{{description}}} + * * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} */ {{^multiplatform}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache index d7a2fcf31bd..a8d7695e2db 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache @@ -18,4 +18,4 @@ {{#deprecated}} @Deprecated(message = "This property is deprecated.") {{/deprecated}} - {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#isUniqueItems}}kotlin.collections.Set{{/isUniqueItems}}{{^isUniqueItems}}kotlin.collections.List{{/isUniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{#isNullable}}?{{/isNullable}} \ No newline at end of file + {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#isUniqueItems}}kotlin.collections.Set{{/isUniqueItems}}{{^isUniqueItems}}kotlin.collections.List{{/isUniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache index 4a6a7acfa31..3548914cd0a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache @@ -18,13 +18,12 @@ import kotlinx.serialization.* {{/multiplatform}} /** -* {{{description}}} -* Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} -*/ - -{{#multiplatform}}@Serializable{{/multiplatform}}{{#kotlinx_serialization}}@Serializable{{/kotlinx_serialization}} + * {{{description}}} + * + * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} + */ +{{#multiplatform}}@Serializable(with = {{classname}}.Serializer::class){{/multiplatform}}{{#kotlinx_serialization}}@Serializable{{/kotlinx_serialization}} {{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{classname}}(val value: {{{dataType}}}) { - {{#allowableValues}}{{#enumVars}} {{^multiplatform}} {{#moshi}} @@ -55,12 +54,29 @@ import kotlinx.serialization.* {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} {{/isArray}} {{/enumVars}}{{/allowableValues}} - /** - This override toString avoids using the enum var name and uses the actual api value instead. - In cases the var name and value are different, the client would send incorrect enums to the server. - **/ - override fun toString(): String { - return value{{^isString}}.toString(){{/isString}} + * Override toString() to avoid using the enum variable name as the value, and instead use + * the actual value defined in the API spec file. + * + * This solves a problem when the variable name and its value are different, and ensures that + * the client sends the correct enum values to the server always. + */ + override fun toString(): String = value{{^isString}}.toString(){{/isString}} + + companion object { + /** + * Converts the provided [data] to a [String] on success, null otherwise. + */ + fun encode(data: Any?): kotlin.String? = if (data is {{classname}}) "$data" else null + + /** + * Returns a valid [{{classname}}] for [data], null otherwise. + */ + fun decode(data: Any?): {{classname}}? = data?.let { + val normalizedData = "$it".lowercase() + values().firstOrNull { value -> + it == value || normalizedData == "$value".lowercase() + } + } } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache index 32384488b9a..7488e6a9f57 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache @@ -33,7 +33,7 @@ class HttpBearerAuth( } private fun upperCaseBearer(): String { - return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema + return if (schema.lowercase().equals("bearer")) "Bearer" else schema } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache index 3a547de74bb..d77219ff5ee 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache @@ -1,11 +1,19 @@ /** -* {{{appName}}} -* {{{appDescription}}} -* -* {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}} -* {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}} -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ \ No newline at end of file + * {{{appName}}} + * + * {{{appDescription}}} + * + * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}} + * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}} + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index be50dd6c442..40670673b69 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 54df813fcee..b50d6f2bde4 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.google.gson.annotations.SerializedName /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @SerializedName("code") val code: kotlin.Int? = null, + @SerializedName("type") val type: kotlin.String? = null, + @SerializedName("message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt index fdefa74fda0..f9b43a4a716 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.google.gson.annotations.SerializedName /** * A category for a pet + * * @param id * @param name */ data class Category ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt index 05e8a533cb9..6f2bc958cfe 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.google.gson.annotations.SerializedName /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.google.gson.annotations.SerializedName */ data class Order ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("petId") val petId: kotlin.Long? = null, + @SerializedName("quantity") val quantity: kotlin.Int? = null, + @SerializedName("shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @SerializedName("status") val status: Order.Status? = null, + @SerializedName("complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt index cbefe8712ef..7bcec4de927 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.google.gson.annotations.SerializedName /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.google.gson.annotations.SerializedName */ data class Pet ( + @SerializedName("name") val name: kotlin.String, + @SerializedName("photoUrls") val photoUrls: kotlin.collections.List, + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("category") val category: Category? = null, + @SerializedName("tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @SerializedName("status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 28e82b1df68..dbf125cb0ba 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.google.gson.annotations.SerializedName /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt index 62baf33e927..631e09ec6bf 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.google.gson.annotations.SerializedName /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.google.gson.annotations.SerializedName */ data class User ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("username") val username: kotlin.String? = null, + @SerializedName("firstName") val firstName: kotlin.String? = null, + @SerializedName("lastName") val lastName: kotlin.String? = null, + @SerializedName("email") val email: kotlin.String? = null, + @SerializedName("password") val password: kotlin.String? = null, + @SerializedName("phone") val phone: kotlin.String? = null, + /* User Status */ @SerializedName("userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index be50dd6c442..40670673b69 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index c341f8ca321..94a0b0b47d4 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @field:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonProperty("message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index 2ed5390c1f3..6deb64d4d33 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * A category for a pet + * * @param id * @param name */ data class Category ( + @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonProperty("name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index 4a2d6e0bd57..e3361219965 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.fasterxml.jackson.annotation.JsonProperty */ data class Order ( + @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @field:JsonProperty("status") val status: Order.Status? = null, + @field:JsonProperty("complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: PLACED,APPROVED,DELIVERED */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index fa98c892601..bae9497a175 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.fasterxml.jackson.annotation.JsonProperty */ data class Pet ( + @field:JsonProperty("name") val name: kotlin.String, + @field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonProperty("category") val category: Category? = null, + @field:JsonProperty("tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @field:JsonProperty("status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: AVAILABLE,PENDING,SOLD */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 7243f42ed7d..cb7be4de181 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonProperty("name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index e8f639e5092..64042f583b0 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.fasterxml.jackson.annotation.JsonProperty */ data class User ( + @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonProperty("phone") val phone: kotlin.String? = null, + /* User Status */ @field:JsonProperty("userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index cb784ddba8b..4f75772cdd0 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 5e349f9f96e..c53f3e313ec 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message @@ -25,11 +35,15 @@ import kotlinx.parcelize.Parcelize @Parcelize data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) : Parcelable diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt index 38cc2226846..51c35a061e1 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,15 +27,19 @@ import kotlinx.parcelize.Parcelize /** * A category for a pet + * * @param id * @param name */ @Parcelize data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Parcelable diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt index 7e9d9fc4644..c5066202ee3 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -28,23 +38,31 @@ import kotlinx.parcelize.Parcelize @Parcelize data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) : Parcelable { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt index 35de5ef28a2..6ff38c8e0d5 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -20,6 +29,7 @@ import kotlinx.parcelize.Parcelize /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -30,23 +40,31 @@ import kotlinx.parcelize.Parcelize @Parcelize data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) : Parcelable { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt index dc72586b991..18421bb3ac3 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,15 +27,19 @@ import kotlinx.parcelize.Parcelize /** * A tag for a pet + * * @param id * @param name */ @Parcelize data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Parcelable diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt index 9a840f06e7f..22889800c03 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -30,22 +40,31 @@ import kotlinx.parcelize.Parcelize @Parcelize data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) : Parcelable diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 9ae9e8f0890..ebc04af4962 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index e9120ae8209..6349ba587bd 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index da3c33f134b..62b8abae696 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index fc89bf34e7f..dfb777a87f7 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,18 +26,23 @@ import java.io.Serializable /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @SerializedName("code") val code: kotlin.Int? = null, + @SerializedName("type") val type: kotlin.String? = null, + @SerializedName("message") val message: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt index b483bee69b3..c2c611fdbe2 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A category for a pet + * * @param id * @param name */ data class Category ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt index 8980b2883ef..e69b6f68ac7 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -26,19 +36,26 @@ import java.io.Serializable */ data class Order ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("petId") val petId: kotlin.Long? = null, + @SerializedName("quantity") val quantity: kotlin.Int? = null, + @SerializedName("shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @SerializedName("status") val status: Order.Status? = null, + @SerializedName("complete") val complete: kotlin.Boolean? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -46,6 +63,7 @@ data class Order ( /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt index 7ddddd99e96..e5732a1f240 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -19,6 +28,7 @@ import java.io.Serializable /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -28,19 +38,26 @@ import java.io.Serializable */ data class Pet ( + @SerializedName("name") val name: kotlin.String, + @SerializedName("photoUrls") val photoUrls: kotlin.collections.List, + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("category") val category: Category? = null, + @SerializedName("tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @SerializedName("status") val status: Pet.Status? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -48,6 +65,7 @@ data class Pet ( /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt index a1a282cb38d..f39d14831ab 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt index 59ba0254f60..6f5e04a7bcc 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -28,23 +38,32 @@ import java.io.Serializable */ data class User ( + @SerializedName("id") val id: kotlin.Long? = null, + @SerializedName("username") val username: kotlin.String? = null, + @SerializedName("firstName") val firstName: kotlin.String? = null, + @SerializedName("lastName") val lastName: kotlin.String? = null, + @SerializedName("email") val email: kotlin.String? = null, + @SerializedName("password") val password: kotlin.String? = null, + @SerializedName("phone") val phone: kotlin.String? = null, + /* User Status */ @SerializedName("userStatus") val userStatus: kotlin.Int? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index be50dd6c442..40670673b69 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 18d2ce3dbbe..9db3de68228 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,17 +26,22 @@ import com.squareup.moshi.JsonClass /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ @JsonClass(generateAdapter = true) data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt index 8396fa42357..60e6efed3bb 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,14 +26,18 @@ import com.squareup.moshi.JsonClass /** * A category for a pet + * * @param id * @param name */ @JsonClass(generateAdapter = true) data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt index 1a84efc4cb1..1afbd25c024 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import com.squareup.moshi.JsonClass /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -26,23 +36,31 @@ import com.squareup.moshi.JsonClass */ @JsonClass(generateAdapter = true) data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt index 633f509bbd2..3da7fac874d 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -19,6 +28,7 @@ import com.squareup.moshi.JsonClass /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -28,23 +38,31 @@ import com.squareup.moshi.JsonClass */ @JsonClass(generateAdapter = true) data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt index e7cdab2bb5d..c64e4efbed1 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,14 +26,18 @@ import com.squareup.moshi.JsonClass /** * A tag for a pet + * * @param id * @param name */ @JsonClass(generateAdapter = true) data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt index 1bfad844904..59c0398042c 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import com.squareup.moshi.JsonClass /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -28,22 +38,31 @@ import com.squareup.moshi.JsonClass */ @JsonClass(generateAdapter = true) data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index 5df1dfc40ee..2d2f96b6b89 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index 345ef648864..eb85ffc9f1c 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 6e1f7d50f25..4d16f664b83 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt index 91150fbf26b..0358a25b540 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,14 +27,19 @@ import kotlinx.serialization.encoding.* /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ @Serializable data class ApiResponse ( + @SerialName(value = "code") val code: kotlin.Int? = null, + @SerialName(value = "type") val type: kotlin.String? = null, + @SerialName(value = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt index 8c17893935b..a13ef95df05 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,12 +27,16 @@ import kotlinx.serialization.encoding.* /** * A category for a pet + * * @param id * @param name */ @Serializable data class Category ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt index f5ae575d19e..737e56528be 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,6 +27,7 @@ import kotlinx.serialization.encoding.* /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -27,17 +37,25 @@ import kotlinx.serialization.encoding.* */ @Serializable data class Order ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "petId") val petId: kotlin.Long? = null, + @SerialName(value = "quantity") val quantity: kotlin.Int? = null, + @SerialName(value = "shipDate") val shipDate: kotlin.String? = null, + /* Order Status */ @SerialName(value = "status") val status: Order.Status? = null, + @SerialName(value = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ @Serializable diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt index 55879c6c7ac..acc9ed19e36 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -20,6 +29,7 @@ import kotlinx.serialization.encoding.* /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -29,17 +39,25 @@ import kotlinx.serialization.encoding.* */ @Serializable data class Pet ( + @SerialName(value = "name") @Required val name: kotlin.String, + @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.collections.List, + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "category") val category: Category? = null, + @SerialName(value = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @SerialName(value = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ @Serializable diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt index 54a4e01d29a..fa092c96568 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,12 +27,16 @@ import kotlinx.serialization.encoding.* /** * A tag for a pet + * * @param id * @param name */ @Serializable data class Tag ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt index 4c69c432e2e..5c5b18c0d05 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -18,6 +27,7 @@ import kotlinx.serialization.encoding.* /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -29,14 +39,23 @@ import kotlinx.serialization.encoding.* */ @Serializable data class User ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "username") val username: kotlin.String? = null, + @SerialName(value = "firstName") val firstName: kotlin.String? = null, + @SerialName(value = "lastName") val lastName: kotlin.String? = null, + @SerialName(value = "email") val email: kotlin.String? = null, + @SerialName(value = "password") val password: kotlin.String? = null, + @SerialName(value = "phone") val phone: kotlin.String? = null, + /* User Status */ @SerialName(value = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt index fcff288bfef..d7f388f67dd 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package util diff --git a/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt index b8b36f3f759..2ddea12d6a3 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package util diff --git a/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt index b8b36f3f759..2ddea12d6a3 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package util diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 7919953d4b4..5d1237fe7f0 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 10e2b946005..eaba8410d1b 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 4983dc73feb..f9b43b19735 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index a695278dfa3..a38d613adbe 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.squareup.moshi.Json /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ internal data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt index 376994a9b25..9de433b75e7 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A category for a pet + * * @param id * @param name */ internal data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt index a5e3ef5a289..2ccfb38a9c6 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.squareup.moshi.Json */ internal data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ internal enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt index 1609ba878dc..88ce520dd5a 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.squareup.moshi.Json /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.squareup.moshi.Json */ internal data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ internal enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt index d9b84e93eaf..5e750974813 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A tag for a pet + * * @param id * @param name */ internal data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt index e0e821cd7e3..fa92a880d31 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.squareup.moshi.Json */ internal data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 401a66cf94d..8c27503582d 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index d8b1ad578f5..c616a2dd05c 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a8848130116..c65ff9948ae 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 7d40c8efbc2..617982fdfe3 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,18 +26,23 @@ import java.io.Serializable /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt index ceb0fbc8fe6..f458d178e33 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt index 941b2ec6d39..beaf9bbc2d3 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -26,19 +36,26 @@ import java.io.Serializable */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -46,6 +63,7 @@ data class Order ( /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt index 079c44f026a..0ad65abf40e 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -19,6 +28,7 @@ import java.io.Serializable /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -28,19 +38,26 @@ import java.io.Serializable */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -48,6 +65,7 @@ data class Pet ( /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt index 944b1cd0a14..ded73dc723d 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt index 9697f07d5bf..03d55050eb8 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -28,23 +38,32 @@ import java.io.Serializable */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index be50dd6c442..40670673b69 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index fafca8738f6..d430296dc4d 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.squareup.moshi.Json /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt index a4c17c3b49d..94a40441cbe 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt index 2bdaec85131..7e63926e7ff 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.squareup.moshi.Json */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt index 0e38da34b79..fb28ee92225 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.squareup.moshi.Json /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.squareup.moshi.Json */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt index 6e619023a5c..fcd3c28dcd7 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt index af1e270325d..ab10e1ddfd3 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.squareup.moshi.Json */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index fbe55ab909f..0773d7f17d9 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -19,18 +28,23 @@ import java.io.Serializable /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ @KSerializable data class ApiResponse ( + @SerialName(value = "code") val code: kotlin.Int? = null, + @SerialName(value = "type") val type: kotlin.String? = null, + @SerialName(value = "message") val message: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt index 5b2c9a487de..6a45df20b83 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -19,15 +28,19 @@ import java.io.Serializable /** * A category for a pet + * * @param id * @param name */ @KSerializable data class Category ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt index 4121b6fbbbb..7146ee9cc58 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -19,6 +28,7 @@ import java.io.Serializable /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -28,19 +38,26 @@ import java.io.Serializable */ @KSerializable data class Order ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "petId") val petId: kotlin.Long? = null, + @SerialName(value = "quantity") val quantity: kotlin.Int? = null, + @Contextual @SerialName(value = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @SerialName(value = "status") val status: Order.Status? = null, + @SerialName(value = "complete") val complete: kotlin.Boolean? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -48,6 +65,7 @@ data class Order ( /** * Order Status + * * Values: PLACED,APPROVED,DELIVERED */ @KSerializable diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt index ea1cd27b262..a3c43c02c9b 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -21,6 +30,7 @@ import java.io.Serializable /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -30,19 +40,26 @@ import java.io.Serializable */ @KSerializable data class Pet ( + @SerialName(value = "name") val name: kotlin.String, + @SerialName(value = "photoUrls") val photoUrls: kotlin.collections.List, + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "category") val category: Category? = null, + @SerialName(value = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @SerialName(value = "status") val status: Pet.Status? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -50,6 +67,7 @@ data class Pet ( /** * pet status in the store + * * Values: AVAILABLE,PENDING,SOLD */ @KSerializable diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt index e26edf9170a..29286beda55 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -19,15 +28,19 @@ import java.io.Serializable /** * A tag for a pet + * * @param id * @param name */ @KSerializable data class Tag ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt index 23231a7536e..06153097411 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -19,6 +28,7 @@ import java.io.Serializable /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -30,23 +40,32 @@ import java.io.Serializable */ @KSerializable data class User ( + @SerialName(value = "id") val id: kotlin.Long? = null, + @SerialName(value = "username") val username: kotlin.String? = null, + @SerialName(value = "firstName") val firstName: kotlin.String? = null, + @SerialName(value = "lastName") val lastName: kotlin.String? = null, + @SerialName(value = "email") val email: kotlin.String? = null, + @SerialName(value = "password") val password: kotlin.String? = null, + @SerialName(value = "phone") val phone: kotlin.String? = null, + /* User Status */ @SerialName(value = "userStatus") val userStatus: kotlin.Int? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index fafca8738f6..d430296dc4d 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.squareup.moshi.Json /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt index a4c17c3b49d..94a40441cbe 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt index 2bdaec85131..7e63926e7ff 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.squareup.moshi.Json */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt index 0e38da34b79..fb28ee92225 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.squareup.moshi.Json /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.squareup.moshi.Json */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt index 6e619023a5c..fcd3c28dcd7 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt index af1e270325d..ab10e1ddfd3 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.squareup.moshi.Json */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index fafca8738f6..d430296dc4d 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.squareup.moshi.Json /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt index a4c17c3b49d..94a40441cbe 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt index 2bdaec85131..7e63926e7ff 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.squareup.moshi.Json */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt index 0e38da34b79..fb28ee92225 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.squareup.moshi.Json /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.squareup.moshi.Json */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt index 6e619023a5c..fcd3c28dcd7 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt index af1e270325d..ab10e1ddfd3 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.squareup.moshi.Json */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index fde3a1918c9..3847bd974ef 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 7d40c8efbc2..617982fdfe3 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,18 +26,23 @@ import java.io.Serializable /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt index ceb0fbc8fe6..f458d178e33 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt index 3484f720ad7..12de5d3d9f7 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -26,19 +36,26 @@ import java.io.Serializable */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: kotlin.String? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -46,6 +63,7 @@ data class Order ( /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt index e87900fbea0..51546bc6eee 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -19,6 +28,7 @@ import java.io.Serializable /** * A pet for sale in the pet store + * * @param id * @param category * @param name @@ -28,19 +38,26 @@ import java.io.Serializable */ data class Pet ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -48,6 +65,7 @@ data class Pet ( /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt index 944b1cd0a14..ded73dc723d 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt index 9697f07d5bf..03d55050eb8 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -28,23 +38,32 @@ import java.io.Serializable */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 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 be50dd6c442..40670673b69 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse 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 56a23202f82..dcd1f62cea7 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order 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 9f93e853a12..94443903760 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User 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 fafca8738f6..d430296dc4d 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,17 +25,22 @@ import com.squareup.moshi.Json /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) 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 a4c17c3b49d..94a40441cbe 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) 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 4221574da26..7c8f86f72cd 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -25,23 +35,31 @@ import com.squareup.moshi.Json */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: org.threeten.bp.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) { /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { 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 0e38da34b79..fb28ee92225 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -18,6 +27,7 @@ import com.squareup.moshi.Json /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -27,23 +37,31 @@ import com.squareup.moshi.Json */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) { /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { 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 6e619023a5c..fcd3c28dcd7 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,14 +25,18 @@ import com.squareup.moshi.Json /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) 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 af1e270325d..ab10e1ddfd3 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 @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -16,6 +25,7 @@ import com.squareup.moshi.Json /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -27,22 +37,31 @@ import com.squareup.moshi.Json */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt index 59cebc5d4b9..59ed587ef74 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt @@ -1,14 +1,23 @@ /** -* OpenAPI Petstore -* Test for issue 4062 -* -* 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. -*/ + * OpenAPI Petstore + * + * Test for issue 4062 + * + * The version of the OpenAPI document: 1.0.0 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.PetEnum diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt index 0bc84e75f73..aa6831225a2 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt @@ -1,41 +1,66 @@ /** -* OpenAPI Petstore -* Test for issue 4062 -* -* 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. -*/ + * OpenAPI Petstore + * + * Test for issue 4062 + * + * The version of the OpenAPI document: 1.0.0 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import com.squareup.moshi.Json /** -* An enum with complex-ish naming -* Values: MY_FIRST_VALUE,MY_SECOND_VALUE -*/ - + * An enum with complex-ish naming + * + * Values: MY_FIRST_VALUE,MY_SECOND_VALUE + */ enum class PetEnum(val value: kotlin.String) { - @Json(name = "myFirstValue") MY_FIRST_VALUE("myFirstValue"), @Json(name = "MY_SECOND_VALUE") MY_SECOND_VALUE("MY_SECOND_VALUE"); - /** - This override toString avoids using the enum var name and uses the actual api value instead. - In cases the var name and value are different, the client would send incorrect enums to the server. - **/ - override fun toString(): String { - return value + * Override toString() to avoid using the enum variable name as the value, and instead use + * the actual value defined in the API spec file. + * + * This solves a problem when the variable name and its value are different, and ensures that + * the client sends the correct enum values to the server always. + */ + override fun toString(): String = value + + companion object { + /** + * Converts the provided [data] to a [String] on success, null otherwise. + */ + fun encode(data: Any?): kotlin.String? = if (data is PetEnum) "$data" else null + + /** + * Returns a valid [PetEnum] for [data], null otherwise. + */ + fun decode(data: Any?): PetEnum? = data?.let { + val normalizedData = "$it".lowercase() + values().firstOrNull { value -> + it == value || normalizedData == "$value".lowercase() + } + } } } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index be50dd6c442..40670673b69 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.ApiResponse diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a23202f82..dcd1f62cea7 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.Order diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9f93e853a12..94443903760 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.apis import org.openapitools.client.models.User diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index 7d40c8efbc2..617982fdfe3 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,18 +26,23 @@ import java.io.Serializable /** * Describes the result of uploading an image resource + * * @param code * @param type * @param message */ data class ApiResponse ( + @Json(name = "code") val code: kotlin.Int? = null, + @Json(name = "type") val type: kotlin.String? = null, + @Json(name = "message") val message: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt index ceb0fbc8fe6..f458d178e33 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A category for a pet + * * @param id * @param name */ data class Category ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt index 941b2ec6d39..beaf9bbc2d3 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * An order for a pets from the pet store + * * @param id * @param petId * @param quantity @@ -26,19 +36,26 @@ import java.io.Serializable */ data class Order ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "petId") val petId: kotlin.Long? = null, + @Json(name = "quantity") val quantity: kotlin.Int? = null, + @Json(name = "shipDate") val shipDate: java.time.OffsetDateTime? = null, + /* Order Status */ @Json(name = "status") val status: Order.Status? = null, + @Json(name = "complete") val complete: kotlin.Boolean? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -46,6 +63,7 @@ data class Order ( /** * Order Status + * * Values: placed,approved,delivered */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt index 079c44f026a..0ad65abf40e 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models import org.openapitools.client.models.Category @@ -19,6 +28,7 @@ import java.io.Serializable /** * A pet for sale in the pet store + * * @param name * @param photoUrls * @param id @@ -28,19 +38,26 @@ import java.io.Serializable */ data class Pet ( + @Json(name = "name") val name: kotlin.String, + @Json(name = "photoUrls") val photoUrls: kotlin.collections.List, + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "category") val category: Category? = null, + @Json(name = "tags") val tags: kotlin.collections.List? = null, + /* pet status in the store */ @Json(name = "status") val status: Pet.Status? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 @@ -48,6 +65,7 @@ data class Pet ( /** * pet status in the store + * * Values: available,pending,sold */ enum class Status(val value: kotlin.String) { diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt index 944b1cd0a14..ded73dc723d 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,15 +26,19 @@ import java.io.Serializable /** * A tag for a pet + * * @param id * @param name */ data class Tag ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "name") val name: kotlin.String? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt index 9697f07d5bf..03d55050eb8 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt @@ -1,14 +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. -* -* 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. -*/ + * 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 + * + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + package org.openapitools.client.models @@ -17,6 +26,7 @@ import java.io.Serializable /** * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -28,23 +38,32 @@ import java.io.Serializable */ data class User ( + @Json(name = "id") val id: kotlin.Long? = null, + @Json(name = "username") val username: kotlin.String? = null, + @Json(name = "firstName") val firstName: kotlin.String? = null, + @Json(name = "lastName") val lastName: kotlin.String? = null, + @Json(name = "email") val email: kotlin.String? = null, + @Json(name = "password") val password: kotlin.String? = null, + @Json(name = "phone") val phone: kotlin.String? = null, + /* User Status */ @Json(name = "userStatus") val userStatus: kotlin.Int? = null + ) : Serializable { companion object { private const val serialVersionUID: Long = 123 From ec49dc3fed4b4b9294401269c7f8485fa01e6429 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 2 Aug 2021 18:04:38 +0800 Subject: [PATCH 18/72] [Kotlin] minor bug fixes (#10071) * fix http basic auth, deprecate option, escape special property name * update doc --- docs/generators/kotlin.md | 4 +-- .../languages/AbstractKotlinCodegen.java | 24 ++++++++++----- .../languages/KotlinClientCodegen.java | 29 +++++++------------ .../infrastructure/ApiClient.kt.mustache | 7 +---- 4 files changed, 30 insertions(+), 34 deletions(-) diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md index 089db56e616..a8a1d0be869 100644 --- a/docs/generators/kotlin.md +++ b/docs/generators/kotlin.md @@ -27,8 +27,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |sourceFolder|source folder for generated code| |src/main/kotlin| |supportAndroidApiLevel25AndBelow|[WARNING] This flag will generate code that has a known security vulnerability. It uses `kotlin.io.createTempFile` instead of `java.nio.file.Files.createTempFile` in oder to support Android API level 25 and bellow. For more info, please check the following links https://github.com/OpenAPITools/openapi-generator/security/advisories/GHSA-23x4-m842-fmwf, https://github.com/OpenAPITools/openapi-generator/pull/9284| |false| |useCoroutines|Whether to use the Coroutines adapter with the retrofit2 library.| |false| -|useRxJava|Whether to use the RxJava adapter with the retrofit2 library.| |false| -|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library.| |false| +|useRxJava|Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.| |false| +|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.| |false| |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false| ## IMPORT MAPPING 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 bc6c0079358..1dd3780689c 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 @@ -23,12 +23,7 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConfig; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenModel; -import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.DefaultCodegen; +import org.openapitools.codegen.*; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,6 +68,10 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase; protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.moshi; + // model classes cannot use the same property names defined in HashMap + // ref: https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-hash-map/ + protected Set propertyAdditionalKeywords = new HashSet<>(Arrays.asList("entries", "keys", "size", "values")); + public AbstractKotlinCodegen() { super(); @@ -856,11 +855,20 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co } // should be the same as variable name - return toVarName(name); + return toVariableName(name); } @Override public String toVarName(String name) { + name = toVariableName(name); + if (propertyAdditionalKeywords.contains(name)) { + return camelize("property_" + name, true); + } else { + return name; + } + } + + protected String toVariableName(String name) { // sanitize name name = sanitizeName(name, "\\W-[\\$]"); name = sanitizeKotlinSpecificNames(name); @@ -984,7 +992,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co itemsSchema.setDefault(element.asText()); defaultContent.append(toDefaultValue(itemsSchema)).append(","); }); - defaultContent.deleteCharAt(defaultContent.length()-1); // remove trailing comma + defaultContent.deleteCharAt(defaultContent.length() - 1); // remove trailing comma return arrInstantiationType + "Of(" + defaultContent + ")"; } } else if (ModelUtils.isStringSchema(p)) { 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 1b71f1a9e27..18609546f8f 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 @@ -17,21 +17,12 @@ package org.openapitools.codegen.languages; -import static java.util.Collections.sort; - import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenModel; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenParameter; -import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.SupportingFile; +import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; +import org.openapitools.codegen.utils.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openapitools.codegen.utils.ProcessUtils; import java.io.File; import java.util.HashMap; @@ -40,6 +31,8 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.Collections.sort; + public class KotlinClientCodegen extends AbstractKotlinCodegen { private final Logger LOGGER = LoggerFactory.getLogger(KotlinClientCodegen.class); @@ -204,8 +197,8 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { requestDateConverter.setDefault(this.requestDateConverter); cliOptions.add(requestDateConverter); - cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library.")); - cliOptions.add(CliOption.newBoolean(USE_RX_JAVA2, "Whether to use the RxJava2 adapter with the retrofit2 library.")); + cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.")); + cliOptions.add(CliOption.newBoolean(USE_RX_JAVA2, "Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.")); cliOptions.add(CliOption.newBoolean(USE_RX_JAVA3, "Whether to use the RxJava3 adapter with the retrofit2 library.")); cliOptions.add(CliOption.newBoolean(USE_COROUTINES, "Whether to use the Coroutines adapter with the retrofit2 library.")); @@ -378,7 +371,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { additionalProperties.put("isList", true); } - if(usesRetrofit2Library()) { + if (usesRetrofit2Library()) { if (ProcessUtils.hasOAuthMethods(openAPI)) { supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.kt.mustache", authFolder, "ApiKeyAuth.kt")); supportingFiles.add(new SupportingFile("auth/OAuth.kt.mustache", authFolder, "OAuth.kt")); @@ -386,11 +379,11 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { supportingFiles.add(new SupportingFile("auth/OAuthOkHttpClient.kt.mustache", authFolder, "OAuthOkHttpClient.kt")); } - if(ProcessUtils.hasHttpBearerMethods(openAPI)) { + if (ProcessUtils.hasHttpBearerMethods(openAPI)) { supportingFiles.add(new SupportingFile("auth/HttpBearerAuth.kt.mustache", authFolder, "HttpBearerAuth.kt")); } - if(ProcessUtils.hasHttpBasicMethods(openAPI)) { + if (ProcessUtils.hasHttpBasicMethods(openAPI)) { supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.kt.mustache", authFolder, "HttpBasicAuth.kt")); } } @@ -591,7 +584,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { private void commonSupportingFiles() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - if(getLibrary().equals(MULTIPLATFORM)) { + if (getLibrary().equals(MULTIPLATFORM)) { supportingFiles.add(new SupportingFile("build.gradle.kts.mustache", "", "build.gradle.kts")); supportingFiles.add(new SupportingFile("settings.gradle.kts.mustache", "", "settings.gradle.kts")); } else { @@ -677,7 +670,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { if (one.isPathParam && another.isQueryParam) { return -1; } - if (one.isQueryParam && another.isPathParam){ + if (one.isQueryParam && another.isPathParam) { return 1; } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 572fbafbc80..742a69012ed 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -3,11 +3,6 @@ package {{packageName}}.infrastructure {{#supportAndroidApiLevel25AndBelow}} import android.os.Build {{/supportAndroidApiLevel25AndBelow}} -{{#hasAuthMethods}} -{{#isBasicBasic}} -import okhttp3.Credentials -{{/isBasicBasic}} -{{/hasAuthMethods}} import okhttp3.OkHttpClient import okhttp3.RequestBody {{#jvm-okhttp3}} @@ -252,7 +247,7 @@ import com.squareup.moshi.adapter if (requestConfig.headers[Authorization].isNullOrEmpty()) { username?.let { username -> password?.let { password -> - requestConfig.headers[Authorization] = Credentials.basic(username, password) + requestConfig.headers[Authorization] = okhttp3.Credentials.basic(username, password) } } } From 594d08a7a46d3ac0e5a52bfd0bf78f8d03c42b8b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 2 Aug 2021 18:44:03 +0800 Subject: [PATCH 19/72] update kotlin auto-generated test to avoid npe (#10058) --- .../resources/kotlin-spring/api_test.mustache | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 index d33c166d10e..ad8b33bfbff 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache @@ -3,7 +3,6 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} import org.junit.jupiter.api.Test - {{#reactive}} import kotlinx.coroutines.flow.Flow; import kotlinx.coroutines.test.runBlockingTest @@ -12,26 +11,29 @@ import org.springframework.http.ResponseEntity class {{classname}}Test { - {{#serviceInterface}}private val service: {{classname}}Service = {{classname}}ServiceImpl(){{/serviceInterface}} + {{#serviceInterface}} + private val service: {{classname}}Service = {{classname}}ServiceImpl() + {{/serviceInterface}} private val api: {{classname}}Controller = {{classname}}Controller({{#serviceInterface}}service{{/serviceInterface}}) - {{#operations}}{{#operation}} + {{#operations}} + {{#operation}} /** - * {{summary}} - * - * {{notes}} - * - * @throws ApiException - * if the Api call fails - */ + * To test {{classname}}Controller.{{operationId}} + * + * @throws ApiException + * if the Api call fails + */ @Test fun {{operationId}}Test() {{#reactive}}= runBlockingTest {{/reactive}}{ {{#allParams}} val {{paramName}}:{{{dataType}}}? = null {{/allParams}} - val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{paramName}}!!{{^-last}}, {{/-last}}{{/allParams}}) + val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) // TODO: test validations } - {{/operation}}{{/operations}} + + {{/operation}} + {{/operations}} } From 0ceeddb4410802103f882b5a829e48f982950b98 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 3 Aug 2021 16:43:21 +0800 Subject: [PATCH 20/72] fix path and query parameters encoding (#10069) --- .../resources/csharp-netcore/WebRequestPathBuilder.mustache | 5 +++-- .../src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache index 8175f0e5757..30e5181eeac 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache @@ -1,5 +1,6 @@ {{>partial_header}} using System.Collections.Generic; +using System.Web; namespace {{packageName}}.Client { @@ -21,7 +22,7 @@ namespace {{packageName}}.Client { foreach (var parameter in parameters) { - _path = _path.Replace("{" + parameter.Key + "}", parameter.Value); + _path = _path.Replace("{" + parameter.Key + "}", HttpUtility.UrlEncode(parameter.Value)); } } @@ -31,7 +32,7 @@ namespace {{packageName}}.Client { foreach (var value in parameter.Value) { - _query = _query + parameter.Key + "=" + value + "&"; + _query = _query + parameter.Key + "=" + HttpUtility.UrlEncode(value) + "&"; } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs index 9071bd2262c..62cdf6a1d9b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs @@ -8,6 +8,7 @@ */ using System.Collections.Generic; +using System.Web; namespace Org.OpenAPITools.Client { @@ -29,7 +30,7 @@ namespace Org.OpenAPITools.Client { foreach (var parameter in parameters) { - _path = _path.Replace("{" + parameter.Key + "}", parameter.Value); + _path = _path.Replace("{" + parameter.Key + "}", HttpUtility.UrlEncode(parameter.Value)); } } @@ -39,7 +40,7 @@ namespace Org.OpenAPITools.Client { foreach (var value in parameter.Value) { - _query = _query + parameter.Key + "=" + value + "&"; + _query = _query + parameter.Key + "=" + HttpUtility.UrlEncode(value) + "&"; } } } From 31eb65ab67b3807728213d0dd11e32ae28b069de Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 3 Aug 2021 16:43:39 +0800 Subject: [PATCH 21/72] [C#][netcore] minor bug fixes (#10074) * fix property name, fix enum comment * update doc --- docs/generators/aspnetcore.md | 2 ++ docs/generators/csharp-dotnet2.md | 2 ++ docs/generators/csharp-netcore.md | 2 ++ docs/generators/csharp.md | 2 ++ .../codegen/languages/AbstractCSharpCodegen.java | 9 ++++++++- .../codegen/languages/CSharpNetCoreClientCodegen.java | 5 +++++ .../src/main/resources/csharp-netcore/modelEnum.mustache | 2 +- .../resources/csharp-netcore/modelInnerEnum.mustache | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- 14 files changed, 29 insertions(+), 9 deletions(-) diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md index d7e282c8279..6e07567bcc1 100644 --- a/docs/generators/aspnetcore.md +++ b/docs/generators/aspnetcore.md @@ -98,6 +98,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
    • Client
      • +
    • Configuration
      • +
    • Version
    • abstract
    • as
    • async
      • diff --git a/docs/generators/csharp-dotnet2.md b/docs/generators/csharp-dotnet2.md index 4ce8ee5b14b..fa97c717000 100644 --- a/docs/generators/csharp-dotnet2.md +++ b/docs/generators/csharp-dotnet2.md @@ -68,6 +68,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
      • Client
        • +
      • Configuration
        • +
      • Version
      • abstract
      • as
      • base
        • diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 8999e7a3a61..7a30e18f899 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -94,6 +94,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
        • Client
          • +
        • Configuration
          • +
        • Version
        • abstract
        • as
        • base
          • diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md index 0b3185606ec..b572a6c3710 100644 --- a/docs/generators/csharp.md +++ b/docs/generators/csharp.md @@ -88,6 +88,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
          • Client
            • +
          • Configuration
            • +
          • Version
          • abstract
          • as
          • base
            • 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 1de6d2f1200..fa09150e555 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 @@ -87,6 +87,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co private final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class); + // special property keywords not allowed as these are the function names in the model files + protected Set propertySpecialKeywords = new HashSet<>(Arrays.asList("ToString", "ToJson", "GetHashCode", "Equals", "ShouldSerializeToString")); + public AbstractCSharpCodegen() { super(); @@ -115,7 +118,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // set "client" as a reserved word to avoid conflicts with Org.OpenAPITools.Client // this is a workaround and can be removed if c# api client is updated to use // fully qualified name - "Client", "client", "parameter", + "Client", "client", "parameter", "Configuration", "Version", // local variable names in API methods (endpoints) "localVarPath", "localVarPathParams", "localVarQueryParams", "localVarHeaderParams", "localVarFormParams", "localVarFileParams", "localVarStatusCode", "localVarResponse", @@ -829,6 +832,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co name = escapeReservedWord(name); } + if (propertySpecialKeywords.contains(name)) { + return camelize("property_" + name); + } + return name; } 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 96c7c92f5ec..3e6a692ecec 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 @@ -902,6 +902,11 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { name = escapeReservedWord(name); } + // for function names in the model, escape with the "Property" prefix + if (propertySpecialKeywords.contains(name)) { + return camelize("property_" + name); + } + return name; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache index 39bcd2eddc1..c977374019f 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache @@ -18,7 +18,7 @@ {{#allowableValues}} {{#enumVars}} /// - /// Enum {{name}} for value: {{{value}}} + /// Enum {{name}} for value: {{value}} /// {{#isString}} [EnumMember(Value = "{{{value}}}")] diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache index d9e96dccdb3..90090fea8c9 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache @@ -13,7 +13,7 @@ {{#allowableValues}} {{#enumVars}} /// - /// Enum {{name}} for value: {{{value}}} + /// Enum {{name}} for value: {{value}} /// {{#isString}} [EnumMember(Value = "{{{value}}}")] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs index 6d745892008..970c5b99e54 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs index ca4515c95da..1aaebc63555 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -40,7 +40,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs index be9b0c5e801..4743b435846 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs index be9b0c5e801..4743b435846 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs index be9b0c5e801..4743b435846 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, 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 d92ef28bc12..0cfe576f1f9 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 @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model public enum JustSymbolEnum { /// - /// Enum GreaterThanOrEqualTo for value: >= + /// Enum GreaterThanOrEqualTo for value: >= /// [EnumMember(Value = ">=")] GreaterThanOrEqualTo = 1, From bea17c9d68b75b3239f9ed06df42b477d9e0c8d8 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:48:20 +0800 Subject: [PATCH 22/72] [typescript] Fix: any type (8 liner PR) (#10080) * [typescript] Fix: any type (1 liner PR) * Add toAllOfName override * Add tests * Add line at EOF --- ...escript-consolidated-composed-schemas.yaml | 6 + .../languages/TypeScriptClientCodegen.java | 8 + .../builds/composed-schemas/.gitignore | 1 + .../.openapi-generator-ignore | 23 ++ .../composed-schemas/.openapi-generator/FILES | 29 +++ .../.openapi-generator/VERSION | 1 + .../builds/composed-schemas/README.md | 30 +++ .../composed-schemas/apis/DefaultApi.ts | 213 ++++++++++++++++ .../builds/composed-schemas/apis/baseapi.ts | 37 +++ .../builds/composed-schemas/apis/exception.ts | 14 ++ .../builds/composed-schemas/auth/auth.ts | 49 ++++ .../builds/composed-schemas/configuration.ts | 66 +++++ .../builds/composed-schemas/git_push.sh | 52 ++++ .../builds/composed-schemas/http/http.ts | 220 ++++++++++++++++ .../composed-schemas/http/isomorphic-fetch.ts | 32 +++ .../builds/composed-schemas/index.ts | 11 + .../builds/composed-schemas/middleware.ts | 66 +++++ .../builds/composed-schemas/models/Cat.ts | 43 ++++ .../composed-schemas/models/CatAllOf.ts | 42 ++++ .../builds/composed-schemas/models/Dog.ts | 46 ++++ .../composed-schemas/models/DogAllOf.ts | 45 ++++ .../composed-schemas/models/InlineObject.ts | 35 +++ .../models/ObjectSerializer.ts | 238 ++++++++++++++++++ .../composed-schemas/models/PetByAge.ts | 42 ++++ .../composed-schemas/models/PetByType.ts | 45 ++++ .../builds/composed-schemas/models/all.ts | 7 + .../builds/composed-schemas/package.json | 27 ++ .../builds/composed-schemas/rxjsStub.ts | 27 ++ .../builds/composed-schemas/servers.ts | 53 ++++ .../builds/composed-schemas/tsconfig.json | 29 +++ .../composed-schemas/types/ObjectParamAPI.ts | 71 ++++++ .../composed-schemas/types/ObservableAPI.ts | 96 +++++++ .../composed-schemas/types/PromiseAPI.ts | 54 ++++ .../builds/composed-schemas/util.ts | 28 +++ 34 files changed, 1786 insertions(+) create mode 100644 bin/configs/typescript-consolidated-composed-schemas.yaml create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/.gitignore create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator-ignore create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/README.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/baseapi.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/exception.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/git_push.sh create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/isomorphic-fetch.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/middleware.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineObject.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/all.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/package.json create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/rxjsStub.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/tsconfig.json create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/PromiseAPI.ts create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/util.ts diff --git a/bin/configs/typescript-consolidated-composed-schemas.yaml b/bin/configs/typescript-consolidated-composed-schemas.yaml new file mode 100644 index 00000000000..0da510f5bfc --- /dev/null +++ b/bin/configs/typescript-consolidated-composed-schemas.yaml @@ -0,0 +1,6 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/composed-schemas +inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript +additionalProperties: + npmName: ts-petstore-client diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 821d190f5eb..926a4eb41bb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -156,6 +156,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); typeMapping.put("Error", "Error"); + typeMapping.put("AnyType", "any"); cliOptions.add(new CliOption(NPM_NAME, "The name under which you want to publish generated npm package." + @@ -893,6 +894,13 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return String.join(" | ", types); } + @Override + public String toAllOfName(List names, ComposedSchema composedSchema) { + List types = getTypesFromSchemas(composedSchema.getAllOf()); + + return String.join(" & ", types); + } + /** * Extracts the list of type names from a list of schemas. * Excludes `AnyType` if there are other valid types extracted. diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.gitignore b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.gitignore new file mode 100644 index 00000000000..1521c8b7652 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.gitignore @@ -0,0 +1 @@ +dist diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES new file mode 100644 index 00000000000..3647b2a71bd --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES @@ -0,0 +1,29 @@ +.gitignore +README.md +apis/DefaultApi.ts +apis/baseapi.ts +apis/exception.ts +auth/auth.ts +configuration.ts +git_push.sh +http/http.ts +http/isomorphic-fetch.ts +index.ts +middleware.ts +models/Cat.ts +models/CatAllOf.ts +models/Dog.ts +models/DogAllOf.ts +models/InlineObject.ts +models/ObjectSerializer.ts +models/PetByAge.ts +models/PetByType.ts +models/all.ts +package.json +rxjsStub.ts +servers.ts +tsconfig.json +types/ObjectParamAPI.ts +types/ObservableAPI.ts +types/PromiseAPI.ts +util.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/README.md b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/README.md new file mode 100644 index 00000000000..80b1ac5cc98 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/README.md @@ -0,0 +1,30 @@ +## ts-petstore-client@1.0.0 + +This generator creates TypeScript/JavaScript client that utilizes fetch-api. + +### Building + +To build and compile the typescript sources to javascript use: +``` +npm install +npm run build +``` + +### Publishing + +First build the package then run ```npm publish``` + +### Consuming + +navigate to the folder of your consuming project and run one of the following commands. + +_published:_ + +``` +npm install ts-petstore-client@1.0.0 --save +``` + +_unPublished (not recommended):_ + +``` +npm install PATH_TO_GENERATED_PACKAGE --save diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts new file mode 100644 index 00000000000..b2fe591913c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts @@ -0,0 +1,213 @@ +// TODO: better import syntax? +import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {Configuration} from '../configuration'; +import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {ObjectSerializer} from '../models/ObjectSerializer'; +import {ApiException} from './exception'; +import {isCodeInRange} from '../util'; + +import { Cat } from '../models/Cat'; +import { Dog } from '../models/Dog'; +import { InlineObject } from '../models/InlineObject'; +import { PetByAge } from '../models/PetByAge'; +import { PetByType } from '../models/PetByType'; + +/** + * no description + */ +export class DefaultApiRequestFactory extends BaseAPIRequestFactory { + + /** + * @param inlineObject + */ + public async filePost(inlineObject?: InlineObject, _options?: Configuration): Promise { + let _config = _options || this.configuration; + + + // Path Params + const localVarPath = '/file'; + + // Make Request Context + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + // Query Params + + // Header Params + + // Form Params + + + // Body Params + const contentType = ObjectSerializer.getPreferredMediaType([ + "application/json" + ]); + requestContext.setHeaderParam("Content-Type", contentType); + const serializedBody = ObjectSerializer.stringify( + ObjectSerializer.serialize(inlineObject, "InlineObject", ""), + contentType + ); + requestContext.setBody(serializedBody); + + // Apply auth methods + + return requestContext; + } + + /** + * @param petByAgePetByType + */ + public async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, _options?: Configuration): Promise { + let _config = _options || this.configuration; + + + // Path Params + const localVarPath = '/pets-filtered'; + + // Make Request Context + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + // Query Params + + // Header Params + + // Form Params + + + // Body Params + const contentType = ObjectSerializer.getPreferredMediaType([ + "application/json" + ]); + requestContext.setHeaderParam("Content-Type", contentType); + const serializedBody = ObjectSerializer.stringify( + ObjectSerializer.serialize(petByAgePetByType, "PetByAge | PetByType", ""), + contentType + ); + requestContext.setBody(serializedBody); + + // Apply auth methods + + return requestContext; + } + + /** + * @param catDog + */ + public async petsPatch(catDog?: Cat | Dog, _options?: Configuration): Promise { + let _config = _options || this.configuration; + + + // Path Params + const localVarPath = '/pets'; + + // Make Request Context + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + // Query Params + + // Header Params + + // Form Params + + + // Body Params + const contentType = ObjectSerializer.getPreferredMediaType([ + "application/json" + ]); + requestContext.setHeaderParam("Content-Type", contentType); + const serializedBody = ObjectSerializer.stringify( + ObjectSerializer.serialize(catDog, "Cat | Dog", ""), + contentType + ); + requestContext.setBody(serializedBody); + + // Apply auth methods + + return requestContext; + } + +} + +export class DefaultApiResponseProcessor { + + /** + * Unwraps the actual response sent by the server from the response context and deserializes the response content + * to the expected objects + * + * @params response Response returned by the server for a request to filePost + * @throws ApiException if the response code was not in [200, 299] + */ + public async filePost(response: ResponseContext): Promise { + const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]); + if (isCodeInRange("200", response.httpStatusCode)) { + return; + } + + // Work around for missing responses in specification, e.g. for petstore.yaml + if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) { + const body: void = ObjectSerializer.deserialize( + ObjectSerializer.parse(await response.body.text(), contentType), + "void", "" + ) as void; + return body; + } + + let body = response.body || ""; + throw new ApiException(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\""); + } + + /** + * Unwraps the actual response sent by the server from the response context and deserializes the response content + * to the expected objects + * + * @params response Response returned by the server for a request to petsFilteredPatch + * @throws ApiException if the response code was not in [200, 299] + */ + public async petsFilteredPatch(response: ResponseContext): Promise { + const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]); + if (isCodeInRange("200", response.httpStatusCode)) { + return; + } + + // Work around for missing responses in specification, e.g. for petstore.yaml + if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) { + const body: void = ObjectSerializer.deserialize( + ObjectSerializer.parse(await response.body.text(), contentType), + "void", "" + ) as void; + return body; + } + + let body = response.body || ""; + throw new ApiException(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\""); + } + + /** + * Unwraps the actual response sent by the server from the response context and deserializes the response content + * to the expected objects + * + * @params response Response returned by the server for a request to petsPatch + * @throws ApiException if the response code was not in [200, 299] + */ + public async petsPatch(response: ResponseContext): Promise { + const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]); + if (isCodeInRange("200", response.httpStatusCode)) { + return; + } + + // Work around for missing responses in specification, e.g. for petstore.yaml + if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) { + const body: void = ObjectSerializer.deserialize( + ObjectSerializer.parse(await response.body.text(), contentType), + "void", "" + ) as void; + return body; + } + + let body = response.body || ""; + throw new ApiException(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\""); + } + +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/baseapi.ts new file mode 100644 index 00000000000..fe7ee3d1511 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/baseapi.ts @@ -0,0 +1,37 @@ +import { Configuration } from '../configuration' + +/** + * + * @export + */ +export const COLLECTION_FORMATS = { + csv: ",", + ssv: " ", + tsv: "\t", + pipes: "|", +}; + + +/** + * + * @export + * @class BaseAPI + */ +export class BaseAPIRequestFactory { + + constructor(protected configuration: Configuration) { + } +}; + +/** + * + * @export + * @class RequiredError + * @extends {Error} + */ +export class RequiredError extends Error { + name: "RequiredError" = "RequiredError"; + constructor(public field: string, msg?: string) { + super(msg); + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/exception.ts new file mode 100644 index 00000000000..fb8d314eb41 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/exception.ts @@ -0,0 +1,14 @@ +/** + * Represents an error caused by an api call i.e. it has attributes for a HTTP status code + * and the returned body object. + * + * Example + * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299] + * => ApiException(404, someErrorMessageObject) + * + */ +export class ApiException extends Error { + public constructor(public code: number, public body: T) { + super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body)) + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts new file mode 100644 index 00000000000..fa859aaa098 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts @@ -0,0 +1,49 @@ +// typings for btoa are incorrect +import { RequestContext } from "../http/http"; + +/** + * Interface authentication schemes. + */ +export interface SecurityAuthentication { + /* + * @return returns the name of the security authentication as specified in OAI + */ + getName(): string; + + /** + * Applies the authentication scheme to the request context + * + * @params context the request context which should use this authentication scheme + */ + applySecurityAuthentication(context: RequestContext): void | Promise; +} + +export interface TokenProvider { + getToken(): Promise | string; +} + + +export type AuthMethods = { +} + +export type ApiKeyConfiguration = string; +export type HttpBasicConfiguration = { "username": string, "password": string }; +export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; +export type OAuth2Configuration = { accessToken: string }; + +export type AuthMethodsConfiguration = { +} + +/** + * Creates the authentication methods from a swagger description. + * + */ +export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods { + let authMethods: AuthMethods = {} + + if (!config) { + return authMethods; + } + + return authMethods; +} \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts new file mode 100644 index 00000000000..b78d85972a4 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -0,0 +1,66 @@ +import { HttpLibrary } from "./http/http"; +import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware"; +import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch"; +import { BaseServerConfiguration, server1 } from "./servers"; +import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; + +export interface Configuration { + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: Middleware[]; + readonly authMethods: AuthMethods; +} + + +/** + * Interface with which a configuration object can be configured. + */ +export interface ConfigurationParameters { + /** + * Default server to use + */ + baseServer?: BaseServerConfiguration; + /** + * HTTP library to use e.g. IsomorphicFetch + */ + httpApi?: HttpLibrary; + /** + * The middlewares which will be applied to requests and responses + */ + middleware?: Middleware[]; + /** + * Configures all middlewares using the promise api instead of observables (which Middleware uses) + */ + promiseMiddleware?: PromiseMiddleware[]; + /** + * Configuration for the available authentication methods + */ + authMethods?: AuthMethodsConfiguration +} + +/** + * Configuration factory function + * + * If a property is not included in conf, a default is used: + * - baseServer: server1 + * - httpApi: IsomorphicFetchHttpLibrary + * - middleware: [] + * - promiseMiddleware: [] + * - authMethods: {} + * + * @param conf partial configuration + */ +export function createConfiguration(conf: ConfigurationParameters = {}): Configuration { + const configuration: Configuration = { + baseServer: conf.baseServer !== undefined ? conf.baseServer : server1, + httpApi: conf.httpApi || new DefaultHttpLibrary(), + middleware: conf.middleware || [], + authMethods: configureAuthMethods(conf.authMethods) + }; + if (conf.promiseMiddleware) { + conf.promiseMiddleware.forEach( + m => configuration.middleware.push(new PromiseMiddlewareWrapper(m)) + ); + } + return configuration; +} \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/git_push.sh new file mode 100644 index 00000000000..8442b80bb44 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/git_push.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=`git remote` +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts new file mode 100644 index 00000000000..8b8219e910f --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts @@ -0,0 +1,220 @@ +// typings of url-parse are incorrect... +// @ts-ignore +import * as URLParse from "url-parse"; +import { Observable, from } from '../rxjsStub'; + +export * from './isomorphic-fetch'; + +/** + * Represents an HTTP method. + */ +export enum HttpMethod { + GET = "GET", + HEAD = "HEAD", + POST = "POST", + PUT = "PUT", + DELETE = "DELETE", + CONNECT = "CONNECT", + OPTIONS = "OPTIONS", + TRACE = "TRACE", + PATCH = "PATCH" +} + +/** + * Represents an HTTP file which will be transferred from or to a server. + */ +export type HttpFile = Blob & { readonly name: string }; + + +export class HttpException extends Error { + public constructor(msg: string) { + super(msg); + } +} + +/** + * Represents the body of an outgoing HTTP request. + */ +export type RequestBody = undefined | string | FormData; + +/** + * Represents an HTTP request context + */ +export class RequestContext { + private headers: { [key: string]: string } = {}; + private body: RequestBody = undefined; + private url: URLParse; + + /** + * Creates the request context using a http method and request resource url + * + * @param url url of the requested resource + * @param httpMethod http method + */ + public constructor(url: string, private httpMethod: HttpMethod) { + this.url = new URLParse(url, true); + } + + /* + * Returns the url set in the constructor including the query string + * + */ + public getUrl(): string { + return this.url.toString(); + } + + /** + * Replaces the url set in the constructor with this url. + * + */ + public setUrl(url: string) { + this.url = new URLParse(url, true); + } + + /** + * Sets the body of the http request either as a string or FormData + * + * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE + * request is discouraged. + * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1 + * + * @param body the body of the request + */ + public setBody(body: RequestBody) { + this.body = body; + } + + public getHttpMethod(): HttpMethod { + return this.httpMethod; + } + + public getHeaders(): { [key: string]: string } { + return this.headers; + } + + public getBody(): RequestBody { + return this.body; + } + + public setQueryParam(name: string, value: string) { + let queryObj = this.url.query; + queryObj[name] = value; + this.url.set("query", queryObj); + } + + /** + * Sets a cookie with the name and value. NO check for duplicate cookies is performed + * + */ + public addCookie(name: string, value: string): void { + if (!this.headers["Cookie"]) { + this.headers["Cookie"] = ""; + } + this.headers["Cookie"] += name + "=" + value + "; "; + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } +} + +export interface ResponseBody { + text(): Promise; + binary(): Promise; +} + +/** + * Helper class to generate a `ResponseBody` from binary data + */ +export class SelfDecodingBody implements ResponseBody { + constructor(private dataSource: Promise) {} + + binary(): Promise { + return this.dataSource; + } + + async text(): Promise { + const data: Blob = await this.dataSource; + // @ts-ignore + if (data.text) { + // @ts-ignore + return data.text(); + } + + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.addEventListener("load", () => resolve(reader.result as string)); + reader.addEventListener("error", () => reject(reader.error)); + reader.readAsText(data); + }); + } +} + +export class ResponseContext { + public constructor( + public httpStatusCode: number, + public headers: { [key: string]: string }, + public body: ResponseBody + ) {} + + /** + * Parse header value in the form `value; param1="value1"` + * + * E.g. for Content-Type or Content-Disposition + * Parameter names are converted to lower case + * The first parameter is returned with the key `""` + */ + public getParsedHeader(headerName: string): { [parameter: string]: string } { + const result: { [parameter: string]: string } = {}; + if (!this.headers[headerName]) { + return result; + } + + const parameters = this.headers[headerName].split(";"); + for (const parameter of parameters) { + let [key, value] = parameter.split("=", 2); + key = key.toLowerCase().trim(); + if (value === undefined) { + result[""] = key; + } else { + value = value.trim(); + if (value.startsWith('"') && value.endsWith('"')) { + value = value.substring(1, value.length - 1); + } + result[key] = value; + } + } + return result; + } + + public async getBodyAsFile(): Promise { + const data = await this.body.binary(); + const fileName = this.getParsedHeader("content-disposition")["filename"] || ""; + const contentType = this.headers["content-type"] || ""; + try { + return new File([data], fileName, { type: contentType }); + } catch (error) { + /** Fallback for when the File constructor is not available */ + return Object.assign(data, { + name: fileName, + type: contentType + }); + } + } +} + +export interface HttpLibrary { + send(request: RequestContext): Observable; +} + +export interface PromiseHttpLibrary { + send(request: RequestContext): Promise; +} + +export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary { + return { + send(request: RequestContext): Observable { + return from(promiseHttpLibrary.send(request)); + } + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/isomorphic-fetch.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/isomorphic-fetch.ts new file mode 100644 index 00000000000..3af85f3d902 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/isomorphic-fetch.ts @@ -0,0 +1,32 @@ +import {HttpLibrary, RequestContext, ResponseContext} from './http'; +import { from, Observable } from '../rxjsStub'; +import "whatwg-fetch"; + +export class IsomorphicFetchHttpLibrary implements HttpLibrary { + + public send(request: RequestContext): Observable { + let method = request.getHttpMethod().toString(); + let body = request.getBody(); + + const resultPromise = fetch(request.getUrl(), { + method: method, + body: body as any, + headers: request.getHeaders(), + credentials: "same-origin" + }).then((resp: any) => { + const headers: { [name: string]: string } = {}; + resp.headers.forEach((value: string, name: string) => { + headers[name] = value; + }); + + const body = { + text: () => resp.text(), + binary: () => resp.blob() + }; + return new ResponseContext(resp.status, headers, body); + }); + + return from>(resultPromise); + + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts new file mode 100644 index 00000000000..127f89d9972 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts @@ -0,0 +1,11 @@ +export * from "./http/http"; +export * from "./auth/auth"; +export * from "./models/all"; +export { createConfiguration } from "./configuration" +export { Configuration } from "./configuration" +export * from "./apis/exception"; +export * from "./servers"; + +export { PromiseMiddleware as Middleware } from './middleware'; +export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI'; + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/middleware.ts new file mode 100644 index 00000000000..e9007138189 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/middleware.ts @@ -0,0 +1,66 @@ +import {RequestContext, ResponseContext} from './http/http'; +import { Observable, from } from './rxjsStub'; + +/** + * Defines the contract for a middleware intercepting requests before + * they are sent (but after the RequestContext was created) + * and before the ResponseContext is unwrapped. + * + */ +export interface Middleware { + /** + * Modifies the request before the request is sent. + * + * @param context RequestContext of a request which is about to be sent to the server + * @returns an observable of the updated request context + * + */ + pre(context: RequestContext): Observable; + /** + * Modifies the returned response before it is deserialized. + * + * @param context ResponseContext of a sent request + * @returns an observable of the modified response context + */ + post(context: ResponseContext): Observable; +} + +export class PromiseMiddlewareWrapper implements Middleware { + + public constructor(private middleware: PromiseMiddleware) { + + } + + pre(context: RequestContext): Observable { + return from(this.middleware.pre(context)); + } + + post(context: ResponseContext): Observable { + return from(this.middleware.post(context)); + } + +} + +/** + * Defines the contract for a middleware intercepting requests before + * they are sent (but after the RequestContext was created) + * and before the ResponseContext is unwrapped. + * + */ +export interface PromiseMiddleware { + /** + * Modifies the request before the request is sent. + * + * @param context RequestContext of a request which is about to be sent to the server + * @returns an observable of the updated request context + * + */ + pre(context: RequestContext): Promise; + /** + * Modifies the returned response before it is deserialized. + * + * @param context ResponseContext of a sent request + * @returns an observable of the modified response context + */ + post(context: ResponseContext): Promise; +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts new file mode 100644 index 00000000000..eb878d1537e --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts @@ -0,0 +1,43 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { CatAllOf } from './CatAllOf'; +import { HttpFile } from '../http/http'; + +export class Cat { + 'hunts'?: boolean; + 'age'?: number; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "hunts", + "baseName": "hunts", + "type": "boolean", + "format": "" + }, + { + "name": "age", + "baseName": "age", + "type": "number", + "format": "" + } ]; + + static getAttributeTypeMap() { + return Cat.attributeTypeMap; + } + + public constructor() { + } +} + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts new file mode 100644 index 00000000000..f492b8a9474 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts @@ -0,0 +1,42 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { HttpFile } from '../http/http'; + +export class CatAllOf { + 'hunts'?: boolean; + 'age'?: number; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "hunts", + "baseName": "hunts", + "type": "boolean", + "format": "" + }, + { + "name": "age", + "baseName": "age", + "type": "number", + "format": "" + } ]; + + static getAttributeTypeMap() { + return CatAllOf.attributeTypeMap; + } + + public constructor() { + } +} + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts new file mode 100644 index 00000000000..456b63bd038 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts @@ -0,0 +1,46 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { DogAllOf } from './DogAllOf'; +import { HttpFile } from '../http/http'; + +export class Dog { + 'bark'?: boolean; + 'breed'?: DogBreedEnum; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "bark", + "baseName": "bark", + "type": "boolean", + "format": "" + }, + { + "name": "breed", + "baseName": "breed", + "type": "DogBreedEnum", + "format": "" + } ]; + + static getAttributeTypeMap() { + return Dog.attributeTypeMap; + } + + public constructor() { + } +} + + +export type DogBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ; + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts new file mode 100644 index 00000000000..75fb0ac2fae --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts @@ -0,0 +1,45 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { HttpFile } from '../http/http'; + +export class DogAllOf { + 'bark'?: boolean; + 'breed'?: DogAllOfBreedEnum; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "bark", + "baseName": "bark", + "type": "boolean", + "format": "" + }, + { + "name": "breed", + "baseName": "breed", + "type": "DogAllOfBreedEnum", + "format": "" + } ]; + + static getAttributeTypeMap() { + return DogAllOf.attributeTypeMap; + } + + public constructor() { + } +} + + +export type DogAllOfBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ; + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineObject.ts new file mode 100644 index 00000000000..d6ffd66e692 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineObject.ts @@ -0,0 +1,35 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { HttpFile } from '../http/http'; + +export class InlineObject { + 'file'?: any; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "file", + "baseName": "file", + "type": "any", + "format": "" + } ]; + + static getAttributeTypeMap() { + return InlineObject.attributeTypeMap; + } + + public constructor() { + } +} + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts new file mode 100644 index 00000000000..70178da770e --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts @@ -0,0 +1,238 @@ +export * from './Cat'; +export * from './CatAllOf'; +export * from './Dog'; +export * from './DogAllOf'; +export * from './InlineObject'; +export * from './PetByAge'; +export * from './PetByType'; + +import { Cat } from './Cat'; +import { CatAllOf } from './CatAllOf'; +import { Dog , DogBreedEnum } from './Dog'; +import { DogAllOf , DogAllOfBreedEnum } from './DogAllOf'; +import { InlineObject } from './InlineObject'; +import { PetByAge } from './PetByAge'; +import { PetByType, PetByTypePetTypeEnum } from './PetByType'; + +/* tslint:disable:no-unused-variable */ +let primitives = [ + "string", + "boolean", + "double", + "integer", + "long", + "float", + "number", + "any" + ]; + +const supportedMediaTypes: { [mediaType: string]: number } = { + "application/json": Infinity, + "application/octet-stream": 0 +} + + +let enumsMap: Set = new Set([ + "DogBreedEnum", + "DogAllOfBreedEnum", + "PetByTypePetTypeEnum", +]); + +let typeMap: {[index: string]: any} = { + "Cat": Cat, + "CatAllOf": CatAllOf, + "Dog": Dog, + "DogAllOf": DogAllOf, + "InlineObject": InlineObject, + "PetByAge": PetByAge, + "PetByType": PetByType, +} + +export class ObjectSerializer { + public static findCorrectType(data: any, expectedType: string) { + if (data == undefined) { + return expectedType; + } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) { + return expectedType; + } else if (expectedType === "Date") { + return expectedType; + } else { + if (enumsMap.has(expectedType)) { + return expectedType; + } + + if (!typeMap[expectedType]) { + return expectedType; // w/e we don't know the type + } + + // Check the discriminator + let discriminatorProperty = typeMap[expectedType].discriminator; + if (discriminatorProperty == null) { + return expectedType; // the type does not have a discriminator. use it. + } else { + if (data[discriminatorProperty]) { + var discriminatorType = data[discriminatorProperty]; + if(typeMap[discriminatorType]){ + return discriminatorType; // use the type given in the discriminator + } else { + return expectedType; // discriminator did not map to a type + } + } else { + return expectedType; // discriminator was not present (or an empty string) + } + } + } + } + + public static serialize(data: any, type: string, format: string) { + if (data == undefined) { + return data; + } else if (primitives.indexOf(type.toLowerCase()) !== -1) { + return data; + } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6 + let subType: string = type.replace("Array<", ""); // Array => Type> + subType = subType.substring(0, subType.length - 1); // Type> => Type + let transformedData: any[] = []; + for (let index in data) { + let date = data[index]; + transformedData.push(ObjectSerializer.serialize(date, subType, format)); + } + return transformedData; + } else if (type === "Date") { + if (format == "date") { + let month = data.getMonth()+1 + month = month < 10 ? "0" + month.toString() : month.toString() + let day = data.getDate(); + day = day < 10 ? "0" + day.toString() : day.toString(); + + return data.getFullYear() + "-" + month + "-" + day; + } else { + return data.toISOString(); + } + } else { + if (enumsMap.has(type)) { + return data; + } + if (!typeMap[type]) { // in case we dont know the type + return data; + } + + // Get the actual type of this object + type = this.findCorrectType(data, type); + + // get the map for the correct type. + let attributeTypes = typeMap[type].getAttributeTypeMap(); + let instance: {[index: string]: any} = {}; + for (let index in attributeTypes) { + let attributeType = attributeTypes[index]; + instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format); + } + return instance; + } + } + + public static deserialize(data: any, type: string, format: string) { + // polymorphism may change the actual type. + type = ObjectSerializer.findCorrectType(data, type); + if (data == undefined) { + return data; + } else if (primitives.indexOf(type.toLowerCase()) !== -1) { + return data; + } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6 + let subType: string = type.replace("Array<", ""); // Array => Type> + subType = subType.substring(0, subType.length - 1); // Type> => Type + let transformedData: any[] = []; + for (let index in data) { + let date = data[index]; + transformedData.push(ObjectSerializer.deserialize(date, subType, format)); + } + return transformedData; + } else if (type === "Date") { + return new Date(data); + } else { + if (enumsMap.has(type)) {// is Enum + return data; + } + + if (!typeMap[type]) { // dont know the type + return data; + } + let instance = new typeMap[type](); + let attributeTypes = typeMap[type].getAttributeTypeMap(); + for (let index in attributeTypes) { + let attributeType = attributeTypes[index]; + instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format); + } + return instance; + } + } + + + /** + * Normalize media type + * + * We currently do not handle any media types attributes, i.e. anything + * after a semicolon. All content is assumed to be UTF-8 compatible. + */ + public static normalizeMediaType(mediaType: string | undefined): string | undefined { + if (mediaType === undefined) { + return undefined; + } + return mediaType.split(";")[0].trim().toLowerCase(); + } + + /** + * From a list of possible media types, choose the one we can handle best. + * + * The order of the given media types does not have any impact on the choice + * made. + */ + public static getPreferredMediaType(mediaTypes: Array): string { + /** According to OAS 3 we should default to json */ + if (!mediaTypes) { + return "application/json"; + } + + const normalMediaTypes = mediaTypes.map(this.normalizeMediaType); + let selectedMediaType: string | undefined = undefined; + let selectedRank: number = -Infinity; + for (const mediaType of normalMediaTypes) { + if (supportedMediaTypes[mediaType!] > selectedRank) { + selectedMediaType = mediaType; + selectedRank = supportedMediaTypes[mediaType!]; + } + } + + if (selectedMediaType === undefined) { + throw new Error("None of the given media types are supported: " + mediaTypes.join(", ")); + } + + return selectedMediaType!; + } + + /** + * Convert data to a string according the given media type + */ + public static stringify(data: any, mediaType: string): string { + if (mediaType === "application/json") { + return JSON.stringify(data); + } + + throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify."); + } + + /** + * Parse data from a string according to the given media type + */ + public static parse(rawData: string, mediaType: string | undefined) { + if (mediaType === undefined) { + throw new Error("Cannot parse content. No Content-Type defined."); + } + + if (mediaType === "application/json") { + return JSON.parse(rawData); + } + + throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse."); + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts new file mode 100644 index 00000000000..bbd8a86a266 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts @@ -0,0 +1,42 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { HttpFile } from '../http/http'; + +export class PetByAge { + 'age': number; + 'nickname'?: string; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "age", + "baseName": "age", + "type": "number", + "format": "" + }, + { + "name": "nickname", + "baseName": "nickname", + "type": "string", + "format": "" + } ]; + + static getAttributeTypeMap() { + return PetByAge.attributeTypeMap; + } + + public constructor() { + } +} + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts new file mode 100644 index 00000000000..2c8713e565a --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts @@ -0,0 +1,45 @@ +/** + * Example + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * 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. + */ + +import { HttpFile } from '../http/http'; + +export class PetByType { + 'petType': PetByTypePetTypeEnum; + 'hunts'?: boolean; + + static readonly discriminator: string | undefined = undefined; + + static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ + { + "name": "petType", + "baseName": "pet_type", + "type": "PetByTypePetTypeEnum", + "format": "" + }, + { + "name": "hunts", + "baseName": "hunts", + "type": "boolean", + "format": "" + } ]; + + static getAttributeTypeMap() { + return PetByType.attributeTypeMap; + } + + public constructor() { + } +} + + +export type PetByTypePetTypeEnum = "Cat" | "Dog" ; + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/all.ts new file mode 100644 index 00000000000..851c461ecf6 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/all.ts @@ -0,0 +1,7 @@ +export * from './Cat' +export * from './CatAllOf' +export * from './Dog' +export * from './DogAllOf' +export * from './InlineObject' +export * from './PetByAge' +export * from './PetByType' diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/package.json b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/package.json new file mode 100644 index 00000000000..1605e85eb13 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/package.json @@ -0,0 +1,27 @@ +{ + "name": "ts-petstore-client", + "version": "1.0.0", + "description": "OpenAPI client for ts-petstore-client", + "author": "OpenAPI-Generator Contributors", + "keywords": [ + "fetch", + "typescript", + "openapi-client", + "openapi-generator" + ], + "license": "Unlicense", + "main": "./dist/index.js", + "typings": "./dist/index.d.ts", + "scripts": { + "build": "tsc", + "prepare": "npm run build" + }, + "dependencies": { + "whatwg-fetch": "^3.0.0", + "es6-promise": "^4.2.4", + "url-parse": "^1.4.3" + }, + "devDependencies": { + "typescript": "^3.9.3" + } +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/rxjsStub.ts new file mode 100644 index 00000000000..4c73715a248 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/rxjsStub.ts @@ -0,0 +1,27 @@ +export class Observable { + constructor(private promise: Promise) {} + + toPromise() { + return this.promise; + } + + pipe(callback: (value: T) => S | Promise): Observable { + return new Observable(this.promise.then(callback)); + } +} + +export function from(promise: Promise) { + return new Observable(promise); +} + +export function of(value: T) { + return new Observable(Promise.resolve(value)); +} + +export function mergeMap(callback: (value: T) => Observable) { + return (value: T) => callback(value).toPromise(); +} + +export function map(callback: any) { + return callback; +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts new file mode 100644 index 00000000000..f1bd953bf87 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts @@ -0,0 +1,53 @@ +import { RequestContext, HttpMethod } from "./http/http"; + +export interface BaseServerConfiguration { + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; +} + +/** + * + * Represents the configuration of a server including its + * url template and variable configuration based on the url. + * + */ +export class ServerConfiguration implements BaseServerConfiguration { + public constructor(private url: string, private variableConfiguration: T) {} + + /** + * Sets the value of the variables of this server. + * + * @param variableConfiguration a partial variable configuration for the variables contained in the url + */ + public setVariables(variableConfiguration: Partial) { + Object.assign(this.variableConfiguration, variableConfiguration); + } + + public getConfiguration(): T { + return this.variableConfiguration + } + + private getUrl() { + let replacedUrl = this.url; + for (const key in this.variableConfiguration) { + var re = new RegExp("{" + key + "}","g"); + replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]); + } + return replacedUrl + } + + /** + * Creates a new request context for this server using the url with variables + * replaced with their respective values and the endpoint of the request appended. + * + * @param endpoint the endpoint to be queried on the server + * @param httpMethod httpMethod to be used + * + */ + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod); + } +} + +export const server1 = new ServerConfiguration<{ }>("http://api.example.xyz/v1", { }) + +export const servers = [server1]; diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/tsconfig.json new file mode 100644 index 00000000000..ce51978eb86 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/tsconfig.json @@ -0,0 +1,29 @@ +{ + "compilerOptions": { + "strict": true, + /* Basic Options */ + "target": "es5", + "module": "commonjs", + "moduleResolution": "node", + "declaration": true, + + /* Additional Checks */ + "noUnusedLocals": false, /* Report errors on unused locals. */ // TODO: reenable (unused imports!) + "noUnusedParameters": false, /* Report errors on unused parameters. */ // TODO: set to true again + "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + "removeComments": true, + "sourceMap": true, + "outDir": "./dist", + "noLib": false, + "lib": [ "es6", "dom" ], + }, + "exclude": [ + "dist", + "node_modules" + ], + "filesGlob": [ + "./**/*.ts", + ] +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts new file mode 100644 index 00000000000..d94a613229e --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts @@ -0,0 +1,71 @@ +import { ResponseContext, RequestContext, HttpFile } from '../http/http'; +import * as models from '../models/all'; +import { Configuration} from '../configuration' + +import { Cat } from '../models/Cat'; +import { CatAllOf } from '../models/CatAllOf'; +import { Dog } from '../models/Dog'; +import { DogAllOf } from '../models/DogAllOf'; +import { InlineObject } from '../models/InlineObject'; +import { PetByAge } from '../models/PetByAge'; +import { PetByType } from '../models/PetByType'; + +import { ObservableDefaultApi } from "./ObservableAPI"; +import { DefaultApiRequestFactory, DefaultApiResponseProcessor} from "../apis/DefaultApi"; + +export interface DefaultApiFilePostRequest { + /** + * + * @type InlineObject + * @memberof DefaultApifilePost + */ + inlineObject?: InlineObject +} + +export interface DefaultApiPetsFilteredPatchRequest { + /** + * + * @type PetByAge | PetByType + * @memberof DefaultApipetsFilteredPatch + */ + petByAgePetByType?: PetByAge | PetByType +} + +export interface DefaultApiPetsPatchRequest { + /** + * + * @type Cat | Dog + * @memberof DefaultApipetsPatch + */ + catDog?: Cat | Dog +} + +export class ObjectDefaultApi { + private api: ObservableDefaultApi + + public constructor(configuration: Configuration, requestFactory?: DefaultApiRequestFactory, responseProcessor?: DefaultApiResponseProcessor) { + this.api = new ObservableDefaultApi(configuration, requestFactory, responseProcessor); + } + + /** + * @param param the request object + */ + public filePost(param: DefaultApiFilePostRequest, options?: Configuration): Promise { + return this.api.filePost(param.inlineObject, options).toPromise(); + } + + /** + * @param param the request object + */ + public petsFilteredPatch(param: DefaultApiPetsFilteredPatchRequest, options?: Configuration): Promise { + return this.api.petsFilteredPatch(param.petByAgePetByType, options).toPromise(); + } + + /** + * @param param the request object + */ + public petsPatch(param: DefaultApiPetsPatchRequest, options?: Configuration): Promise { + return this.api.petsPatch(param.catDog, options).toPromise(); + } + +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts new file mode 100644 index 00000000000..f9dd96c5198 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts @@ -0,0 +1,96 @@ +import { ResponseContext, RequestContext, HttpFile } from '../http/http'; +import * as models from '../models/all'; +import { Configuration} from '../configuration' +import { Observable, of, from } from '../rxjsStub'; +import {mergeMap, map} from '../rxjsStub'; +import { Cat } from '../models/Cat'; +import { CatAllOf } from '../models/CatAllOf'; +import { Dog } from '../models/Dog'; +import { DogAllOf } from '../models/DogAllOf'; +import { InlineObject } from '../models/InlineObject'; +import { PetByAge } from '../models/PetByAge'; +import { PetByType } from '../models/PetByType'; + +import { DefaultApiRequestFactory, DefaultApiResponseProcessor} from "../apis/DefaultApi"; +export class ObservableDefaultApi { + private requestFactory: DefaultApiRequestFactory; + private responseProcessor: DefaultApiResponseProcessor; + private configuration: Configuration; + + public constructor( + configuration: Configuration, + requestFactory?: DefaultApiRequestFactory, + responseProcessor?: DefaultApiResponseProcessor + ) { + this.configuration = configuration; + this.requestFactory = requestFactory || new DefaultApiRequestFactory(configuration); + this.responseProcessor = responseProcessor || new DefaultApiResponseProcessor(); + } + + /** + * @param inlineObject + */ + public filePost(inlineObject?: InlineObject, _options?: Configuration): Observable { + const requestContextPromise = this.requestFactory.filePost(inlineObject, _options); + + // build promise chain + let middlewarePreObservable = from(requestContextPromise); + for (let middleware of this.configuration.middleware) { + middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); + } + + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + pipe(mergeMap((response: ResponseContext) => { + let middlewarePostObservable = of(response); + for (let middleware of this.configuration.middleware) { + middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp))); + } + return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.filePost(rsp))); + })); + } + + /** + * @param petByAgePetByType + */ + public petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, _options?: Configuration): Observable { + const requestContextPromise = this.requestFactory.petsFilteredPatch(petByAgePetByType, _options); + + // build promise chain + let middlewarePreObservable = from(requestContextPromise); + for (let middleware of this.configuration.middleware) { + middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); + } + + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + pipe(mergeMap((response: ResponseContext) => { + let middlewarePostObservable = of(response); + for (let middleware of this.configuration.middleware) { + middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp))); + } + return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.petsFilteredPatch(rsp))); + })); + } + + /** + * @param catDog + */ + public petsPatch(catDog?: Cat | Dog, _options?: Configuration): Observable { + const requestContextPromise = this.requestFactory.petsPatch(catDog, _options); + + // build promise chain + let middlewarePreObservable = from(requestContextPromise); + for (let middleware of this.configuration.middleware) { + middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); + } + + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + pipe(mergeMap((response: ResponseContext) => { + let middlewarePostObservable = of(response); + for (let middleware of this.configuration.middleware) { + middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp))); + } + return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.petsPatch(rsp))); + })); + } + +} diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/PromiseAPI.ts new file mode 100644 index 00000000000..4939db8127b --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/PromiseAPI.ts @@ -0,0 +1,54 @@ +import { ResponseContext, RequestContext, HttpFile } from '../http/http'; +import * as models from '../models/all'; +import { Configuration} from '../configuration' + +import { Cat } from '../models/Cat'; +import { CatAllOf } from '../models/CatAllOf'; +import { Dog } from '../models/Dog'; +import { DogAllOf } from '../models/DogAllOf'; +import { InlineObject } from '../models/InlineObject'; +import { PetByAge } from '../models/PetByAge'; +import { PetByType } from '../models/PetByType'; +import { ObservableDefaultApi } from './ObservableAPI'; + +import { DefaultApiRequestFactory, DefaultApiResponseProcessor} from "../apis/DefaultApi"; +export class PromiseDefaultApi { + private api: ObservableDefaultApi + + public constructor( + configuration: Configuration, + requestFactory?: DefaultApiRequestFactory, + responseProcessor?: DefaultApiResponseProcessor + ) { + this.api = new ObservableDefaultApi(configuration, requestFactory, responseProcessor); + } + + /** + * @param inlineObject + */ + public filePost(inlineObject?: InlineObject, _options?: Configuration): Promise { + const result = this.api.filePost(inlineObject, _options); + return result.toPromise(); + } + + /** + * @param petByAgePetByType + */ + public petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, _options?: Configuration): Promise { + const result = this.api.petsFilteredPatch(petByAgePetByType, _options); + return result.toPromise(); + } + + /** + * @param catDog + */ + public petsPatch(catDog?: Cat | Dog, _options?: Configuration): Promise { + const result = this.api.petsPatch(catDog, _options); + return result.toPromise(); + } + + +} + + + diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/util.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/util.ts new file mode 100644 index 00000000000..07317f5828b --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/util.ts @@ -0,0 +1,28 @@ +/** + * Returns if a specific http code is in a given code range + * where the code range is defined as a combination of digits + * and "X" (the letter X) with a length of 3 + * + * @param codeRange string with length 3 consisting of digits and "X" (the letter X) + * @param code the http status code to be checked against the code range + */ +export function isCodeInRange(codeRange: string, code: number): boolean { + // This is how the default value is encoded in OAG + if (codeRange === "0") { + return true; + } + if (codeRange == code.toString()) { + return true; + } else { + const codeString = code.toString(); + if (codeString.length != codeRange.length) { + return false; + } + for (let i = 0; i < codeString.length; i++) { + if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) { + return false; + } + } + return true; + } +} From c21e6de7da45195d46d0c42745dde92bce61db2a Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Tue, 3 Aug 2021 16:50:14 +0800 Subject: [PATCH 23/72] [C][Client] Treat the data type "byteArray" same as "string", part 2 (#10067) --- .../src/main/resources/C-libcurl/model-body.mustache | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index e80036b8b31..a962081a46d 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -248,6 +248,12 @@ void {{classname}}_free({{classname}}_t *{{classname}}) { } {{/isString}} {{/isEnum}} + {{#isByteArray}} + if ({{{classname}}}->{{{name}}}) { + free({{{classname}}}->{{{name}}}); + {{classname}}->{{name}} = NULL; + } + {{/isByteArray}} {{#isBinary}} if ({{{classname}}}->{{{name}}}) { free({{{classname}}}->{{{name}}}->data); From c28c1253a48258feee79e7dbce88425e4597520f Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 3 Aug 2021 17:07:14 +0800 Subject: [PATCH 24/72] fix missing jackson-databind-nullable in okhttp java client (#10078) --- .../Java/libraries/okhttp-gson/build.gradle.mustache | 3 +++ .../Java/libraries/okhttp-gson/build.sbt.mustache | 3 +++ .../resources/Java/libraries/okhttp-gson/pom.mustache | 10 ++++++++++ .../java/okhttp-gson-dynamicOperations/build.gradle | 1 + .../java/okhttp-gson-dynamicOperations/build.sbt | 1 + .../java/okhttp-gson-dynamicOperations/pom.xml | 6 ++++++ .../java/okhttp-gson-parcelableModel/build.gradle | 1 + .../java/okhttp-gson-parcelableModel/build.sbt | 1 + .../petstore/java/okhttp-gson-parcelableModel/pom.xml | 6 ++++++ samples/client/petstore/java/okhttp-gson/build.gradle | 1 + samples/client/petstore/java/okhttp-gson/build.sbt | 1 + samples/client/petstore/java/okhttp-gson/pom.xml | 6 ++++++ 12 files changed, 40 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index 7e3d97298ea..f6002e0ef9e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -108,6 +108,9 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'io.gsonfire:gson-fire:1.8.4' + {{#openApiNullable}} + implementation 'org.openapitools:jackson-databind-nullable:0.2.1' + {{/openApiNullable}} {{#hasOAuthMethods}} implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' {{/hasOAuthMethods}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache index 8979b10a7f8..ccab8251805 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache @@ -14,6 +14,9 @@ lazy val root = (project in file(".")). "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1", "com.google.code.gson" % "gson" % "2.8.6", "org.apache.commons" % "commons-lang3" % "3.10", + {{#openApiNullable}} + "org.openapitools" % "jackson-databind-nullable" % "0.2.1", + {{/openApiNullable}} {{#hasOAuthMethods}} "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", {{/hasOAuthMethods}} 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 74a1b796dcd..38596f5369e 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 @@ -318,6 +318,13 @@ ${javax-annotation-version} provided + {{#openApiNullable}} + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + {{/openApiNullable}} junit @@ -335,6 +342,9 @@ 4.9.1 2.8.6 3.11 + {{#openApiNullable}} + 0.2.1 + {{/openApiNullable}} {{#joda}} 2.10.9 {{/joda}} diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle index 9daaafc5661..e5d608265de 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle @@ -104,6 +104,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'io.gsonfire:gson-fire:1.8.4' + implementation 'org.openapitools:jackson-databind-nullable:0.2.1' implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt index 020460f4527..96c44f5d7de 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt @@ -14,6 +14,7 @@ lazy val root = (project in file(".")). "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1", "com.google.code.gson" % "gson" % "2.8.6", "org.apache.commons" % "commons-lang3" % "3.10", + "org.openapitools" % "jackson-databind-nullable" % "0.2.1", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.swagger.parser.v3" % "swagger-parser-v3" "2.0.23" % "compile" diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml index 942da2a74f0..656360eff39 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml @@ -267,6 +267,11 @@ ${javax-annotation-version} provided + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + junit @@ -284,6 +289,7 @@ 4.9.1 2.8.6 3.11 + 0.2.1 1.5.0 1.3.2 4.13.1 diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle index 5809e790fce..157cb472fc0 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle @@ -104,6 +104,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'io.gsonfire:gson-fire:1.8.4' + implementation 'org.openapitools:jackson-databind-nullable:0.2.1' implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt index c36bbc5ca08..89da006858c 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt @@ -14,6 +14,7 @@ lazy val root = (project in file(".")). "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1", "com.google.code.gson" % "gson" % "2.8.6", "org.apache.commons" % "commons-lang3" % "3.10", + "org.openapitools" % "jackson-databind-nullable" % "0.2.1", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index a2bb80af7fa..6761db7d59d 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -269,6 +269,11 @@ ${javax-annotation-version} provided + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + junit @@ -286,6 +291,7 @@ 4.9.1 2.8.6 3.11 + 0.2.1 1.5.0 1.3.2 4.13.1 diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index 3488028c466..bfa3f209830 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -104,6 +104,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'io.gsonfire:gson-fire:1.8.4' + implementation 'org.openapitools:jackson-databind-nullable:0.2.1' implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt index 6dfd0d7f733..5b476bc7d12 100644 --- a/samples/client/petstore/java/okhttp-gson/build.sbt +++ b/samples/client/petstore/java/okhttp-gson/build.sbt @@ -14,6 +14,7 @@ lazy val root = (project in file(".")). "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1", "com.google.code.gson" % "gson" % "2.8.6", "org.apache.commons" % "commons-lang3" % "3.10", + "org.openapitools" % "jackson-databind-nullable" % "0.2.1", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index bdd59dd9f37..54685657f87 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -262,6 +262,11 @@ ${javax-annotation-version} provided + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + junit @@ -279,6 +284,7 @@ 4.9.1 2.8.6 3.11 + 0.2.1 1.5.0 1.3.2 4.13.1 From 4210b41f842cf9ca9475685ef9803fce8e074e4a Mon Sep 17 00:00:00 2001 From: Sem Schilder Date: Tue, 3 Aug 2021 11:09:52 +0200 Subject: [PATCH 25/72] [php-symfony] Add backslash to "load" namespaces from global namespace (#9740) * Add backslash to load namespace from global namespace * Update example * Remove hardcoded slash * Add backslash from java side * Update samples * Fix first sample * Fix other snapshot * Update version file --- .../languages/PhpSymfonyServerCodegen.java | 8 +- .../main/resources/php-symfony/api.mustache | 4 +- .../org/openapitools/client/ApiClient.java | 10 -- .../org/openapitools/client/ApiClient.java | 10 -- .../SymfonyBundle-php/Api/PetApiInterface.php | 70 +++++----- .../Api/StoreApiInterface.php | 28 ++-- .../Api/UserApiInterface.php | 54 ++++---- .../SymfonyBundle-php/Model/InlineObject.php | 123 ++++++++++++++++++ .../SymfonyBundle-php/Model/InlineObject1.php | 123 ++++++++++++++++++ .../Resources/docs/Model/InlineObject.md | 11 ++ .../Resources/docs/Model/InlineObject1.md | 11 ++ .../Tests/Model/InlineObject1Test.php | 96 ++++++++++++++ .../Tests/Model/InlineObjectTest.php | 96 ++++++++++++++ 13 files changed, 542 insertions(+), 102 deletions(-) create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject.php create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject1.php create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject.md create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject1.md create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/Model/InlineObject1Test.php create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/Model/InlineObjectTest.php 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 f3324629b45..74490df3422 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 @@ -412,17 +412,17 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg } // Create a variable to display the correct data type in comments for interfaces - param.vendorExtensions.put("x-comment-type", param.dataType); + param.vendorExtensions.put("x-comment-type", "\\" + param.dataType); if (param.isContainer) { - param.vendorExtensions.put("x-comment-type", param.dataType + "[]"); + param.vendorExtensions.put("x-comment-type", "\\" + param.dataType + "[]"); } } // Create a variable to display the correct return type in comments for interfaces if (op.returnType != null) { - op.vendorExtensions.put("x-comment-type", op.returnType); + op.vendorExtensions.put("x-comment-type", "\\" + op.returnType); if ("array".equals(op.returnContainer)) { - op.vendorExtensions.put("x-comment-type", op.returnType + "[]"); + op.vendorExtensions.put("x-comment-type", "\\" + op.returnType + "[]"); } } else { op.vendorExtensions.put("x-comment-type", "void"); diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache index 81f343bb38e..00c32b46804 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache @@ -59,8 +59,8 @@ interface {{classname}} {{#allParams}} * @param {{vendorExtensions.x-comment-type}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} {{/allParams}} - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return {{{vendorExtensions.x-comment-type}}} * diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java index 8dd14bf1a27..970b3337373 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java @@ -123,16 +123,6 @@ public class ApiClient { return objectMapper; } - private RequestInterceptor buildOauthRequestInterceptor(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { - switch (flow) { - case password: - return new OauthPasswordGrant(tokenUrl, scopes); - case application: - return new OauthClientCredentialsGrant(authorizationUrl, tokenUrl, scopes); - default: - throw new RuntimeException("Oauth flow \"" + flow + "\" is not implemented"); - } - } public ObjectMapper getObjectMapper(){ return objectMapper; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java index 6dcf3fd1790..0ed3ad8901c 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java @@ -130,16 +130,6 @@ public class ApiClient { return objectMapper; } - private RequestInterceptor buildOauthRequestInterceptor(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { - switch (flow) { - case password: - return new OauthPasswordGrant(tokenUrl, scopes); - case application: - return new OauthClientCredentialsGrant(authorizationUrl, tokenUrl, scopes); - default: - throw new RuntimeException("Oauth flow \"" + flow + "\" is not implemented"); - } - } public ObjectMapper getObjectMapper(){ return objectMapper; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index 4958426e7c8..516447dd143 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -75,11 +75,11 @@ interface PetApiInterface * * Add a new pet to the store * - * @param OpenAPI\Server\Model\Pet $pet Pet object that needs to be added to the store (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\Pet $pet Pet object that needs to be added to the store (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Pet + * @return \OpenAPI\Server\Model\Pet * */ public function addPet(Pet $pet, &$responseCode, array &$responseHeaders); @@ -89,10 +89,10 @@ interface PetApiInterface * * Deletes a pet * - * @param int $petId Pet id to delete (required) - * @param string $apiKey (optional) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $petId Pet id to delete (required) + * @param \string $apiKey (optional) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -104,11 +104,11 @@ interface PetApiInterface * * Finds Pets by status * - * @param string[] $status Status values that need to be considered for filter (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string[] $status Status values that need to be considered for filter (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Pet[] + * @return \OpenAPI\Server\Model\Pet[] * */ public function findPetsByStatus(array $status, &$responseCode, array &$responseHeaders); @@ -118,11 +118,11 @@ interface PetApiInterface * * Finds Pets by tags * - * @param string[] $tags Tags to filter by (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string[] $tags Tags to filter by (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Pet[] + * @return \OpenAPI\Server\Model\Pet[] * */ public function findPetsByTags(array $tags, &$responseCode, array &$responseHeaders); @@ -132,11 +132,11 @@ interface PetApiInterface * * Find pet by ID * - * @param int $petId ID of pet to return (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $petId ID of pet to return (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Pet + * @return \OpenAPI\Server\Model\Pet * */ public function getPetById($petId, &$responseCode, array &$responseHeaders); @@ -146,11 +146,11 @@ interface PetApiInterface * * Update an existing pet * - * @param OpenAPI\Server\Model\Pet $pet Pet object that needs to be added to the store (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\Pet $pet Pet object that needs to be added to the store (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Pet + * @return \OpenAPI\Server\Model\Pet * */ public function updatePet(Pet $pet, &$responseCode, array &$responseHeaders); @@ -160,11 +160,11 @@ interface PetApiInterface * * Updates a pet in the store with form data * - * @param int $petId ID of pet that needs to be updated (required) - * @param string $name Updated name of the pet (optional) - * @param string $status Updated status of the pet (optional) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $petId ID of pet that needs to be updated (required) + * @param \string $name Updated name of the pet (optional) + * @param \string $status Updated status of the pet (optional) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -176,13 +176,13 @@ interface PetApiInterface * * uploads an image * - * @param int $petId ID of pet to update (required) - * @param string $additionalMetadata Additional data to pass to server (optional) - * @param UploadedFile $file file to upload (optional) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $petId ID of pet to update (required) + * @param \string $additionalMetadata Additional data to pass to server (optional) + * @param \UploadedFile $file file to upload (optional) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\ApiResponse + * @return \OpenAPI\Server\Model\ApiResponse * */ public function uploadFile($petId, $additionalMetadata = null, UploadedFile $file = null, &$responseCode, array &$responseHeaders); diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php index cf9093ecf13..cebfa0aecf5 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php @@ -56,9 +56,9 @@ interface StoreApiInterface * * Delete purchase order by ID * - * @param string $orderId ID of the order that needs to be deleted (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string $orderId ID of the order that needs to be deleted (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -70,10 +70,10 @@ interface StoreApiInterface * * Returns pet inventories by status * - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return int + * @return \int * */ public function getInventory(&$responseCode, array &$responseHeaders); @@ -83,11 +83,11 @@ interface StoreApiInterface * * Find purchase order by ID * - * @param int $orderId ID of pet that needs to be fetched (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $orderId ID of pet that needs to be fetched (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Order + * @return \OpenAPI\Server\Model\Order * */ public function getOrderById($orderId, &$responseCode, array &$responseHeaders); @@ -97,11 +97,11 @@ interface StoreApiInterface * * Place an order for a pet * - * @param OpenAPI\Server\Model\Order $order order placed for purchasing the pet (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\Order $order order placed for purchasing the pet (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\Order + * @return \OpenAPI\Server\Model\Order * */ public function placeOrder(Order $order, &$responseCode, array &$responseHeaders); diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php index 71a5cfac669..961b6570e8f 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php @@ -56,9 +56,9 @@ interface UserApiInterface * * Create user * - * @param OpenAPI\Server\Model\User $user Created user object (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\User $user Created user object (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -70,9 +70,9 @@ interface UserApiInterface * * Creates list of users with given input array * - * @param OpenAPI\Server\Model\User[] $user List of user object (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\User[] $user List of user object (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -84,9 +84,9 @@ interface UserApiInterface * * Creates list of users with given input array * - * @param OpenAPI\Server\Model\User[] $user List of user object (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \OpenAPI\Server\Model\User[] $user List of user object (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -98,9 +98,9 @@ interface UserApiInterface * * Delete user * - * @param string $username The name that needs to be deleted (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string $username The name that needs to be deleted (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -112,11 +112,11 @@ interface UserApiInterface * * Get user by user name * - * @param string $username The name that needs to be fetched. Use user1 for testing. (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string $username The name that needs to be fetched. Use user1 for testing. (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return OpenAPI\Server\Model\User + * @return \OpenAPI\Server\Model\User * */ public function getUserByName($username, &$responseCode, array &$responseHeaders); @@ -126,12 +126,12 @@ interface UserApiInterface * * Logs user into the system * - * @param string $username The user name for login (required) - * @param string $password The password for login in clear text (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string $username The user name for login (required) + * @param \string $password The password for login in clear text (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * - * @return string + * @return \string * */ public function loginUser($username, $password, &$responseCode, array &$responseHeaders); @@ -141,8 +141,8 @@ interface UserApiInterface * * Logs out current logged in user session * - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * @@ -154,10 +154,10 @@ interface UserApiInterface * * Updated user * - * @param string $username name that need to be deleted (required) - * @param OpenAPI\Server\Model\User $user Updated user object (required) - * @param integer $responseCode The HTTP response code to return - * @param array $responseHeaders Additional HTTP headers to return with the response () + * @param \string $username name that need to be deleted (required) + * @param \OpenAPI\Server\Model\User $user Updated user object (required) + * @param \int $responseCode The HTTP response code to return + * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void * diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject.php new file mode 100644 index 00000000000..5ee480353c7 --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject.php @@ -0,0 +1,123 @@ +name = isset($data['name']) ? $data['name'] : null; + $this->status = isset($data['status']) ? $data['status'] : null; + } + + /** + * Gets name. + * + * @return string|null + */ + public function getName() + { + return $this->name; + } + + /** + * Sets name. + * + * @param string|null $name Updated name of the pet + * + * @return $this + */ + public function setName($name = null) + { + $this->name = $name; + + return $this; + } + + /** + * Gets status. + * + * @return string|null + */ + public function getStatus() + { + return $this->status; + } + + /** + * Sets status. + * + * @param string|null $status Updated status of the pet + * + * @return $this + */ + public function setStatus($status = null) + { + $this->status = $status; + + return $this; + } +} + + diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject1.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject1.php new file mode 100644 index 00000000000..e27ed1bf082 --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/InlineObject1.php @@ -0,0 +1,123 @@ +additionalMetadata = isset($data['additionalMetadata']) ? $data['additionalMetadata'] : null; + $this->file = isset($data['file']) ? $data['file'] : null; + } + + /** + * Gets additionalMetadata. + * + * @return string|null + */ + public function getAdditionalMetadata() + { + return $this->additionalMetadata; + } + + /** + * Sets additionalMetadata. + * + * @param string|null $additionalMetadata Additional data to pass to server + * + * @return $this + */ + public function setAdditionalMetadata($additionalMetadata = null) + { + $this->additionalMetadata = $additionalMetadata; + + return $this; + } + + /** + * Gets file. + * + * @return UploadedFile|null + */ + public function getFile(): ?UploadedFile + { + return $this->file; + } + + /** + * Sets file. + * + * @param UploadedFile|null $file file to upload + * + * @return $this + */ + public function setFile(UploadedFile $file = null) + { + $this->file = $file; + + return $this; + } +} + + diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject.md b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject.md new file mode 100644 index 00000000000..101275879be --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject.md @@ -0,0 +1,11 @@ +# InlineObject + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | **string** | Updated name of the pet | [optional] +**status** | **string** | Updated status of the pet | [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/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject1.md b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject1.md new file mode 100644 index 00000000000..a69b83edc6a --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Model/InlineObject1.md @@ -0,0 +1,11 @@ +# InlineObject1 + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**additionalMetadata** | **string** | Additional data to pass to server | [optional] +**file** | [**UploadedFile**](UploadedFile.md) | file to upload | [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/server/petstore/php-symfony/SymfonyBundle-php/Tests/Model/InlineObject1Test.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/Model/InlineObject1Test.php new file mode 100644 index 00000000000..9d9ee881a0d --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/Model/InlineObject1Test.php @@ -0,0 +1,96 @@ + Date: Tue, 3 Aug 2021 19:11:16 +1000 Subject: [PATCH 26/72] [go] More idiomatic godoc comments (#10044) * [go] More idiomatic godoc comments * [go] Mark deprecated fields and functions * [go] Minor mustache readability/consistency fixes * [go] Mark deprecated operation parameters * [go] Deprecate a petstore component property for testing * [go] Apply deprecated godoc in Go servers also --- .../codegen/CodegenParameter.java | 6 +- .../openapitools/codegen/DefaultCodegen.java | 3 + .../resources/go-echo-server/api.mustache | 3 + .../resources/go-echo-server/main.mustache | 2 +- .../resources/go-echo-server/model.mustache | 3 + .../go-gin-server/controller-api.mustache | 3 + .../resources/go-gin-server/model.mustache | 3 + .../src/main/resources/go-server/api.mustache | 6 + .../go-server/controller-api.mustache | 3 + .../main/resources/go-server/model.mustache | 3 + .../main/resources/go-server/service.mustache | 3 + .../src/main/resources/go/README.mustache | 2 +- .../src/main/resources/go/api.mustache | 89 +-- .../src/main/resources/go/api_doc.mustache | 8 +- .../src/main/resources/go/client.mustache | 7 +- .../main/resources/go/configuration.mustache | 2 +- .../main/resources/go/model_anyof.mustache | 2 +- .../src/main/resources/go/model_enum.mustache | 8 +- .../main/resources/go/model_oneof.mustache | 2 +- .../main/resources/go/model_simple.mustache | 26 +- .../main/resources/go/partial_header.mustache | 30 +- ...ith-fake-endpoints-models-for-testing.yaml | 1 + ...odels-for-testing-with-http-signature.yaml | 2 + .../src/test/resources/3_0/petstore.yaml | 2 + .../go/go-petstore/api_another_fake.go | 49 +- .../petstore/go/go-petstore/api_fake.go | 499 ++++++++-------- .../go-petstore/api_fake_classname_tags123.go | 49 +- .../client/petstore/go/go-petstore/api_pet.go | 320 +++++------ .../petstore/go/go-petstore/api_store.go | 155 +++-- .../petstore/go/go-petstore/api_user.go | 264 +++++---- .../client/petstore/go/go-petstore/client.go | 12 +- .../petstore/go/go-petstore/configuration.go | 12 +- .../go/go-petstore/model_200_response.go | 12 +- .../model_additional_properties_any_type.go | 12 +- .../model_additional_properties_array.go | 12 +- .../model_additional_properties_boolean.go | 12 +- .../model_additional_properties_class.go | 12 +- .../model_additional_properties_integer.go | 12 +- .../model_additional_properties_number.go | 12 +- .../model_additional_properties_object.go | 12 +- .../model_additional_properties_string.go | 12 +- .../petstore/go/go-petstore/model_animal.go | 12 +- .../go/go-petstore/model_api_response.go | 12 +- .../model_array_of_array_of_number_only.go | 12 +- .../go-petstore/model_array_of_number_only.go | 12 +- .../go/go-petstore/model_array_test_.go | 12 +- .../petstore/go/go-petstore/model_big_cat.go | 12 +- .../go/go-petstore/model_big_cat_all_of.go | 12 +- .../go/go-petstore/model_capitalization.go | 12 +- .../petstore/go/go-petstore/model_cat.go | 12 +- .../go/go-petstore/model_cat_all_of.go | 12 +- .../petstore/go/go-petstore/model_category.go | 12 +- .../go/go-petstore/model_class_model.go | 12 +- .../petstore/go/go-petstore/model_client.go | 12 +- .../petstore/go/go-petstore/model_dog.go | 12 +- .../go/go-petstore/model_dog_all_of.go | 12 +- .../go/go-petstore/model_enum_arrays.go | 12 +- .../go/go-petstore/model_enum_class.go | 12 +- .../go/go-petstore/model_enum_test_.go | 12 +- .../petstore/go/go-petstore/model_file.go | 12 +- .../model_file_schema_test_class.go | 12 +- .../go/go-petstore/model_format_test_.go | 12 +- .../go-petstore/model_has_only_read_only.go | 12 +- .../petstore/go/go-petstore/model_list.go | 12 +- .../go/go-petstore/model_map_test_.go | 12 +- ...perties_and_additional_properties_class.go | 12 +- .../petstore/go/go-petstore/model_name.go | 12 +- .../go/go-petstore/model_number_only.go | 12 +- .../petstore/go/go-petstore/model_order.go | 12 +- .../go/go-petstore/model_outer_composite.go | 12 +- .../go/go-petstore/model_outer_enum.go | 12 +- .../petstore/go/go-petstore/model_pet.go | 12 +- .../go/go-petstore/model_read_only_first.go | 12 +- .../petstore/go/go-petstore/model_return.go | 12 +- .../go-petstore/model_special_model_name.go | 12 +- .../petstore/go/go-petstore/model_tag.go | 12 +- .../go-petstore/model_type_holder_default.go | 12 +- .../go-petstore/model_type_holder_example.go | 12 +- .../petstore/go/go-petstore/model_user.go | 12 +- .../petstore/go/go-petstore/model_xml_item.go | 12 +- .../petstore/go/go-petstore/response.go | 12 +- .../client/petstore/go/go-petstore/utils.go | 12 +- .../api.ts | 1 + .../go-experimental/api_usage.go | 84 +-- .../x-auth-id-alias/go-experimental/client.go | 12 +- .../go-experimental/configuration.go | 12 +- .../go-experimental/response.go | 12 +- .../x-auth-id-alias/go-experimental/utils.go | 12 +- .../petstore/go/go-petstore/api/openapi.yaml | 4 +- .../go/go-petstore/api_another_fake.go | 49 +- .../petstore/go/go-petstore/api_default.go | 42 +- .../petstore/go/go-petstore/api_fake.go | 532 +++++++++--------- .../go-petstore/api_fake_classname_tags123.go | 49 +- .../client/petstore/go/go-petstore/api_pet.go | 321 +++++------ .../petstore/go/go-petstore/api_store.go | 155 +++-- .../petstore/go/go-petstore/api_user.go | 264 +++++---- .../client/petstore/go/go-petstore/client.go | 12 +- .../petstore/go/go-petstore/configuration.go | 12 +- .../go/go-petstore/model_200_response.go | 12 +- .../go-petstore/model__special_model_name_.go | 12 +- .../model_additional_properties_class.go | 12 +- .../petstore/go/go-petstore/model_animal.go | 12 +- .../go/go-petstore/model_api_response.go | 12 +- .../petstore/go/go-petstore/model_apple.go | 12 +- .../go/go-petstore/model_apple_req.go | 12 +- .../model_array_of_array_of_number_only.go | 12 +- .../go-petstore/model_array_of_number_only.go | 12 +- .../go/go-petstore/model_array_test_.go | 12 +- .../petstore/go/go-petstore/model_banana.go | 12 +- .../go/go-petstore/model_banana_req.go | 12 +- .../go/go-petstore/model_capitalization.go | 12 +- .../petstore/go/go-petstore/model_cat.go | 12 +- .../go/go-petstore/model_cat_all_of.go | 12 +- .../petstore/go/go-petstore/model_category.go | 12 +- .../go/go-petstore/model_class_model.go | 12 +- .../petstore/go/go-petstore/model_client.go | 12 +- .../petstore/go/go-petstore/model_dog.go | 12 +- .../go/go-petstore/model_dog_all_of.go | 12 +- .../go/go-petstore/model_enum_arrays.go | 12 +- .../go/go-petstore/model_enum_class.go | 12 +- .../go/go-petstore/model_enum_test_.go | 12 +- .../petstore/go/go-petstore/model_file.go | 12 +- .../model_file_schema_test_class.go | 12 +- .../petstore/go/go-petstore/model_foo.go | 12 +- .../go/go-petstore/model_format_test_.go | 12 +- .../petstore/go/go-petstore/model_fruit.go | 12 +- .../go/go-petstore/model_fruit_req.go | 12 +- .../petstore/go/go-petstore/model_gm_fruit.go | 12 +- .../go-petstore/model_has_only_read_only.go | 12 +- .../go-petstore/model_health_check_result.go | 12 +- .../model_inline_response_default.go | 12 +- .../petstore/go/go-petstore/model_list.go | 12 +- .../petstore/go/go-petstore/model_mammal.go | 12 +- .../go/go-petstore/model_map_test_.go | 12 +- ...perties_and_additional_properties_class.go | 12 +- .../petstore/go/go-petstore/model_name.go | 12 +- .../go/go-petstore/model_nullable_class.go | 12 +- .../go/go-petstore/model_number_only.go | 12 +- .../petstore/go/go-petstore/model_order.go | 12 +- .../go/go-petstore/model_outer_composite.go | 12 +- .../go/go-petstore/model_outer_enum.go | 12 +- .../model_outer_enum_default_value.go | 12 +- .../go-petstore/model_outer_enum_integer.go | 12 +- .../model_outer_enum_integer_default_value.go | 12 +- .../petstore/go/go-petstore/model_pet.go | 16 +- .../go/go-petstore/model_read_only_first.go | 12 +- .../petstore/go/go-petstore/model_return.go | 12 +- .../petstore/go/go-petstore/model_tag.go | 12 +- .../petstore/go/go-petstore/model_user.go | 12 +- .../petstore/go/go-petstore/model_whale.go | 12 +- .../petstore/go/go-petstore/model_zebra.go | 12 +- .../petstore/go/go-petstore/response.go | 12 +- .../client/petstore/go/go-petstore/signing.go | 12 +- .../client/petstore/go/go-petstore/utils.go | 12 +- .../org/openapitools/database/models/Pet.kt | 1 + .../wwwroot/openapi-original.json | 2 + .../petstore/erlang-server/priv/openapi.json | 2 + .../petstore/go-api-server/api/openapi.yaml | 4 +- .../server/petstore/go-api-server/go/api.go | 2 + .../petstore/go-api-server/go/api_pet.go | 1 + .../go-api-server/go/api_pet_service.go | 1 + .../petstore/go-api-server/go/model_pet.go | 1 + .../petstore/go-chi-server/api/openapi.yaml | 4 +- .../server/petstore/go-chi-server/go/api.go | 2 + .../petstore/go-chi-server/go/api_pet.go | 1 + .../go-chi-server/go/api_pet_service.go | 1 + .../petstore/go-chi-server/go/model_pet.go | 1 + .../go-echo-server/.docs/api/openapi.yaml | 4 +- .../go-echo-server/handlers/api_pet.go | 1 + .../server/petstore/go-echo-server/main.go | 40 +- .../go-echo-server/models/model_pet.go | 1 + .../go-gin-api-server/api/openapi.yaml | 4 +- .../petstore/go-gin-api-server/go/api_pet.go | 1 + .../go-gin-api-server/go/model_pet.go | 1 + .../src/main/resources/openapi.yaml | 4 +- .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../petstore/php-slim4/lib/Model/Pet.php | 1 + .../petstore/python-fastapi/openapi.yaml | 4 +- 178 files changed, 2344 insertions(+), 2169 deletions(-) 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 874ac93d152..2266cc48f31 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 @@ -51,6 +51,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public Map vendorExtensions = new HashMap(); public boolean hasValidation; public boolean isNullable; + public boolean isDeprecated; /** * Determines whether this parameter is mandatory. If the parameter is in "path", * this property is required and its value MUST be true. Otherwise, the property @@ -179,6 +180,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { } output.hasValidation = this.hasValidation; output.isNullable = this.isNullable; + output.isDeprecated = this.isDeprecated; output.isBinary = this.isBinary; output.isByteArray = this.isByteArray; output.isString = this.isString; @@ -211,7 +213,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger); } @Override @@ -256,6 +258,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { isEnum == that.isEnum && hasValidation == that.hasValidation && isNullable == that.isNullable && + isDeprecated == that.isDeprecated && required == that.required && isNull == that.isNull && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && @@ -365,6 +368,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", maxProperties=").append(maxProperties); sb.append(", minProperties=").append(minProperties); sb.append(", isNullable=").append(isNullable); + sb.append(", isDeprecated=").append(isDeprecated); sb.append(", required=").append(required); sb.append(", maximum='").append(maximum).append('\''); sb.append(", exclusiveMaximum=").append(exclusiveMaximum); 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 b17b449893f..cb8f6ed8d88 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 @@ -4334,6 +4334,9 @@ public class DefaultCodegen implements CodegenConfig { if (parameter.getRequired() != null) { codegenParameter.required = parameter.getRequired(); } + if (parameter.getDeprecated() != null) { + codegenParameter.isDeprecated = parameter.getDeprecated(); + } codegenParameter.jsonSchema = Json.pretty(parameter); if (GlobalSettings.getProperty("debugParser") != null) { diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache index 9ac9ad29838..6045cae0816 100644 --- a/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache @@ -7,6 +7,9 @@ import ( ){{#operation}} // {{nickname}} - {{{summary}}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func (c *Container) {{operationId}}(ctx echo.Context) error { return ctx.JSON(http.StatusOK, models.HelloWorld { Message: "Hello World", diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache index ef0421cdd11..e8654aaa3f2 100644 --- a/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache +++ b/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache @@ -17,7 +17,7 @@ func main() { e.Use(middleware.Recover()) {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}} - // {{nickname}} - {{{summary}}} + // {{nickname}} - {{{summary}}}{{#isDeprecated}} (deprecated){{/isDeprecated}} e.{{httpMethod.toUpperCase}}("{{{basePathWithoutHost}}}{{{path}}}", c.{{operationId}}) {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/model.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/model.mustache index ef59462f11e..433d848254b 100644 --- a/modules/openapi-generator/src/main/resources/go-echo-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/go-echo-server/model.mustache @@ -18,6 +18,9 @@ const ( type {{classname}} struct { {{#vars}}{{#description}} // {{{description}}}{{/description}} + {{#deprecated}} + // Deprecated + {{/deprecated}} {{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} }{{/isEnum}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/go-gin-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-gin-server/controller-api.mustache index 36eaf59209f..daad0d7dfff 100644 --- a/modules/openapi-generator/src/main/resources/go-gin-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-gin-server/controller-api.mustache @@ -9,6 +9,9 @@ import ( ){{#operation}} // {{nickname}} - {{{summary}}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func {{nickname}}(c *gin.Context) { c.JSON(http.StatusOK, gin.H{}) }{{/operation}}{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/go-gin-server/model.mustache b/modules/openapi-generator/src/main/resources/go-gin-server/model.mustache index 2f67ffafc3b..14993caf01a 100644 --- a/modules/openapi-generator/src/main/resources/go-gin-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/go-gin-server/model.mustache @@ -19,6 +19,9 @@ const ( type {{classname}} struct { {{#vars}}{{#description}} // {{{description}}}{{/description}} + {{#deprecated}} + // Deprecated + {{/deprecated}} {{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} }{{/isEnum}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/go-server/api.mustache b/modules/openapi-generator/src/main/resources/go-server/api.mustache index 8249ffb38f6..f08e1b27038 100644 --- a/modules/openapi-generator/src/main/resources/go-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/api.mustache @@ -13,6 +13,9 @@ import ( // The {{classname}}Router implementation should parse necessary information from the http request, // pass the data to a {{classname}}Servicer to perform the required actions, then write the service results to the http response. type {{classname}}Router interface { {{#operations}}{{#operation}} + {{#isDeprecated}} + // Deprecated + {{/isDeprecated}} {{operationId}}(http.ResponseWriter, *http.Request){{/operation}}{{/operations}} }{{/apis}}{{/apiInfo}}{{#apiInfo}}{{#apis}} @@ -22,5 +25,8 @@ type {{classname}}Router interface { {{#operations}}{{#operation}} // while the service implementation can ignored with the .openapi-generator-ignore file // and updated with the logic required for the API. type {{classname}}Servicer interface { {{#operations}}{{#operation}} + {{#isDeprecated}} + // Deprecated + {{/isDeprecated}} {{operationId}}(context.Context{{#allParams}}, {{dataType}}{{/allParams}}) (ImplResponse, error){{/operation}}{{/operations}} }{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache index 7a7b1262308..2bfa53cd503 100644 --- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache @@ -59,6 +59,9 @@ func (c *{{classname}}Controller) Routes() Routes { }{{#operations}}{{#operation}} // {{nickname}} - {{{summary}}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Request) { {{#hasFormParams}} {{#isMultipart}} diff --git a/modules/openapi-generator/src/main/resources/go-server/model.mustache b/modules/openapi-generator/src/main/resources/go-server/model.mustache index 89860a8fe72..afcfcf7338e 100644 --- a/modules/openapi-generator/src/main/resources/go-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/model.mustache @@ -29,6 +29,9 @@ type {{classname}} struct { {{/parent}} {{#vars}}{{#description}} // {{{description}}}{{/description}} + {{#deprecated}} + // Deprecated + {{/deprecated}} {{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} }{{/isEnum}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/go-server/service.mustache b/modules/openapi-generator/src/main/resources/go-server/service.mustache index a5664b0c350..2df7298b17b 100644 --- a/modules/openapi-generator/src/main/resources/go-server/service.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/service.mustache @@ -20,6 +20,9 @@ func New{{classname}}Service() {{classname}}Servicer { }{{#operations}}{{#operation}} // {{nickname}} - {{summary}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func (s *{{classname}}Service) {{nickname}}(ctx context.Context{{#allParams}}, {{paramName}} {{dataType}}{{/allParams}}) (ImplResponse, error) { // TODO - update {{nickname}} with the required logic for this service method. // Add {{classFilename}}_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. diff --git a/modules/openapi-generator/src/main/resources/go/README.mustache b/modules/openapi-generator/src/main/resources/go/README.mustache index 4e9577633d4..de164be1cf8 100644 --- a/modules/openapi-generator/src/main/resources/go/README.mustache +++ b/modules/openapi-generator/src/main/resources/go/README.mustache @@ -86,7 +86,7 @@ All URIs are relative to *{{basePath}}* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}} +{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{summary}} {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} ## Documentation For Models diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache index 3fd1db0c66c..8b93e7c6b08 100644 --- a/modules/openapi-generator/src/main/resources/go/api.mustache +++ b/modules/openapi-generator/src/main/resources/go/api.mustache @@ -22,20 +22,27 @@ type {{classname}} interface { {{#operation}} /* - * {{operationId}}{{#summary}} {{{.}}}{{/summary}}{{^summary}} Method for {{operationId}}{{/summary}} + {{operationId}} {{{summary}}}{{^summary}}Method for {{operationId}}{{/summary}} {{#notes}} - * {{{unescapedNotes}}} + + {{{unescapedNotes}}} {{/notes}} - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}} - * @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}} - * @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}} + @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}} + @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request + {{#isDeprecated}} + + Deprecated + {{/isDeprecated}} + */ {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request - /* - * {{nickname}}Execute executes the request{{#returnType}} - * @return {{{.}}}{{/returnType}} - */ + // {{nickname}}Execute executes the request{{#returnType}} + // @return {{{.}}}{{/returnType}} + {{#isDeprecated}} + // Deprecated + {{/isDeprecated}} {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {{/operation}} } @@ -46,16 +53,19 @@ type {{classname}}Service service {{#operation}} type {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request struct { - ctx _context.Context{{#generateInterfaces}} - ApiService {{classname}} -{{/generateInterfaces}}{{^generateInterfaces}} - ApiService *{{classname}}Service -{{/generateInterfaces}} + ctx _context.Context + ApiService {{#generateInterfaces}}{{classname}}{{/generateInterfaces}}{{^generateInterfaces}}*{{classname}}Service{{/generateInterfaces}} {{#allParams}} {{paramName}} {{^isPathParam}}*{{/isPathParam}}{{{dataType}}} {{/allParams}} } {{#allParams}}{{^isPathParam}} +{{#description}} +// {{.}} +{{/description}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request { r.{{paramName}} = &{{paramName}} return r @@ -66,14 +76,20 @@ func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Reques } /* - * {{operationId}}{{#summary}} {{{.}}}{{/summary}}{{^summary}} Method for {{operationId}}{{/summary}} +{{operationId}} {{{summary}}}{{^summary}}Method for {{operationId}}{{/summary}} {{#notes}} - * {{{unescapedNotes}}} + +{{{unescapedNotes}}} {{/notes}} - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}} - * @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}} - * @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}} + @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}} + @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request +{{#isDeprecated}} + +Deprecated +{{/isDeprecated}} +*/ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request { return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request{ ApiService: a, @@ -84,10 +100,11 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParam } } -/* - * Execute executes the request{{#returnType}} - * @return {{{.}}}{{/returnType}} - */ +// Execute executes the request{{#returnType}} +// @return {{{.}}}{{/returnType}} +{{#isDeprecated}} +// Deprecated +{{/isDeprecated}} func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.Method{{httpMethod}} @@ -106,7 +123,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class } localVarPath := localBasePath + "{{{path}}}"{{#pathParams}} - localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.PathEscape(parameterToString(r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")), -1){{/pathParams}} + localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.PathEscape(parameterToString(r.{{paramName}}, "{{collectionFormat}}")), -1){{/pathParams}} localVarHeaderParams := make(map[string]string) localVarQueryParams := _neturl.Values{} @@ -171,15 +188,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class if reflect.TypeOf(t).Kind() == reflect.Slice { s := reflect.ValueOf(t) for i := 0; i < s.Len(); i++ { - localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{collectionFormat}}")) } } else { - localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{collectionFormat}}")) } } {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} - localVarQueryParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{collectionFormat}}")) {{/isCollectionFormatMulti}} {{/required}} {{^required}} @@ -189,14 +206,14 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class if reflect.TypeOf(t).Kind() == reflect.Slice { s := reflect.ValueOf(t) for i := 0; i < s.Len(); i++ { - localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{collectionFormat}}")) } } else { - localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{collectionFormat}}")) } {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} - localVarQueryParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarQueryParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{collectionFormat}}")) {{/isCollectionFormatMulti}} } {{/required}} @@ -224,11 +241,11 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class } {{#headerParams}} {{#required}} - localVarHeaderParams["{{baseName}}"] = parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}") + localVarHeaderParams["{{baseName}}"] = parameterToString(*r.{{paramName}}, "{{collectionFormat}}") {{/required}} {{^required}} if r.{{paramName}} != nil { - localVarHeaderParams["{{baseName}}"] = parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}") + localVarHeaderParams["{{baseName}}"] = parameterToString(*r.{{paramName}}, "{{collectionFormat}}") } {{/required}} {{/headerParams}} @@ -253,7 +270,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{/isFile}} {{^isFile}} {{#required}} - localVarFormParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarFormParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{collectionFormat}}")) {{/required}} {{^required}} {{#isModel}} @@ -267,7 +284,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{/isModel}} {{^isModel}} if r.{{paramName}} != nil { - localVarFormParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) + localVarFormParams.Add("{{baseName}}", parameterToString(*r.{{paramName}}, "{{collectionFormat}}")) } {{/isModel}} {{/required}} diff --git a/modules/openapi-generator/src/main/resources/go/api_doc.mustache b/modules/openapi-generator/src/main/resources/go/api_doc.mustache index 458465f8947..c99fff852bb 100644 --- a/modules/openapi-generator/src/main/resources/go/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/go/api_doc.mustache @@ -1,12 +1,12 @@ # {{invokerPackage}}\{{classname}}{{#description}} -{{description}}{{/description}} +{{.}}{{/description}} All URIs are relative to *{{basePath}}* Method | HTTP request | Description ------------- | ------------- | ------------- -{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}} +{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{summary}} {{/operation}}{{/operations}} {{#operations}} @@ -60,7 +60,7 @@ func main() { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc.{{/-last}}{{/pathParams}}{{#pathParams}} -**{{paramName}}** | {{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}} | {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/pathParams}} +**{{paramName}}** | {{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}} | {{description}} | {{#defaultValue}}[default to {{.}}]{{/defaultValue}}{{/pathParams}} ### Other Parameters @@ -69,7 +69,7 @@ Other parameters are passed through a pointer to a api{{{nickname}}}Request stru Name | Type | Description | Notes ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}{{#allParams}} -{{^isPathParam}} **{{paramName}}** | {{#isContainer}}{{#isArray}}{{#items}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**[]{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isArray}}{{#isMap}}{{#items}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**map[string]{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/isContainer}} | {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/isPathParam}}{{/allParams}} +{{^isPathParam}} **{{paramName}}** | {{#isContainer}}{{#isArray}}{{#items}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**[]{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isArray}}{{#isMap}}{{#items}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**map[string]{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isFile}}[{{/isFile}}{{/isPrimitiveType}}**{{dataType}}**{{^isPrimitiveType}}{{^isFile}}]({{^baseType}}{{dataType}}{{/baseType}}{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/isContainer}} | {{description}} | {{#defaultValue}}[default to {{.}}]{{/defaultValue}}{{/isPathParam}}{{/allParams}} ### Return type diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index 572bd7f800c..8cc5dfd6009 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -47,12 +47,7 @@ type APIClient struct { {{#apis}} {{#operations}} - {{#generateInterfaces}} - {{classname}} {{classname}} - {{/generateInterfaces}} - {{^generateInterfaces}} - {{classname}} *{{classname}}Service - {{/generateInterfaces}} + {{classname}} {{#generateInterfaces}}{{classname}}{{/generateInterfaces}}{{^generateInterfaces}}*{{classname}}Service{{/generateInterfaces}} {{/operations}} {{/apis}} {{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/go/configuration.mustache b/modules/openapi-generator/src/main/resources/go/configuration.mustache index f33b012fc41..610f9edc5d2 100644 --- a/modules/openapi-generator/src/main/resources/go/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/go/configuration.mustache @@ -117,7 +117,7 @@ type Configuration struct { func NewConfiguration() *Configuration { cfg := &Configuration{ DefaultHeader: make(map[string]string), - UserAgent: "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{{packageVersion}}}/go{{/httpUserAgent}}", + UserAgent: "{{{httpUserAgent}}}{{^httpUserAgent}}OpenAPI-Generator/{{{packageVersion}}}/go{{/httpUserAgent}}", Debug: false, {{#servers}} {{#-first}} diff --git a/modules/openapi-generator/src/main/resources/go/model_anyof.mustache b/modules/openapi-generator/src/main/resources/go/model_anyof.mustache index 5dfa75302f1..d0738523a2a 100644 --- a/modules/openapi-generator/src/main/resources/go/model_anyof.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_anyof.mustache @@ -1,4 +1,4 @@ -// {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}} +// {{classname}} {{{description}}}{{^description}}struct for {{{classname}}}{{/description}} type {{classname}} struct { {{#anyOf}} {{{.}}} *{{{.}}} diff --git a/modules/openapi-generator/src/main/resources/go/model_enum.mustache b/modules/openapi-generator/src/main/resources/go/model_enum.mustache index 11dfbfc7d33..2432e5c8b36 100644 --- a/modules/openapi-generator/src/main/resources/go/model_enum.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_enum.mustache @@ -1,5 +1,5 @@ -// {{{classname}}} {{#description}}{{{.}}}{{/description}}{{^description}}the model '{{{classname}}}'{{/description}} -type {{{classname}}} {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}} +// {{{classname}}} {{{description}}}{{^description}}the model '{{{classname}}}'{{/description}} +type {{{classname}}} {{{format}}}{{^format}}{{dataType}}{{/format}} // List of {{{name}}} const ( @@ -21,7 +21,7 @@ var allowed{{{classname}}}EnumValues = []{{{classname}}}{ } func (v *{{{classname}}}) UnmarshalJSON(src []byte) error { - var value {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}} + var value {{{format}}}{{^format}}{{dataType}}{{/format}} err := json.Unmarshal(src, &value) if err != nil { return err @@ -39,7 +39,7 @@ func (v *{{{classname}}}) UnmarshalJSON(src []byte) error { // New{{{classname}}}FromValue returns a pointer to a valid {{{classname}}} // for the value passed as argument, or an error if the value passed is not allowed by the enum -func New{{{classname}}}FromValue(v {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}}) (*{{{classname}}}, error) { +func New{{{classname}}}FromValue(v {{{format}}}{{^format}}{{dataType}}{{/format}}) (*{{{classname}}}, error) { ev := {{{classname}}}(v) if ev.IsValid() { return &ev, nil diff --git a/modules/openapi-generator/src/main/resources/go/model_oneof.mustache b/modules/openapi-generator/src/main/resources/go/model_oneof.mustache index a0322e34074..e67a172de67 100644 --- a/modules/openapi-generator/src/main/resources/go/model_oneof.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_oneof.mustache @@ -1,4 +1,4 @@ -// {{classname}} - {{#description}}{{{description}}}{{/description}}{{^description}}struct for {{{classname}}}{{/description}} +// {{classname}} - {{{description}}}{{^description}}struct for {{{classname}}}{{/description}} type {{classname}} struct { {{#oneOf}} {{{.}}} *{{{.}}} diff --git a/modules/openapi-generator/src/main/resources/go/model_simple.mustache b/modules/openapi-generator/src/main/resources/go/model_simple.mustache index da651274308..a2e30fc4b8f 100644 --- a/modules/openapi-generator/src/main/resources/go/model_simple.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_simple.mustache @@ -1,4 +1,4 @@ -// {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}} +// {{classname}} {{{description}}}{{^description}}struct for {{{classname}}}{{/description}} type {{classname}} struct { {{#parent}} {{^isMap}} @@ -16,6 +16,9 @@ type {{classname}} struct { {{#description}} // {{{description}}} {{/description}} +{{#deprecated}} + // Deprecated +{{/deprecated}} {{name}} {{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} {{#isAdditionalPropertiesTrue}} @@ -84,6 +87,9 @@ func New{{classname}}WithDefaults() *{{classname}} { {{#isNullable}} // If the value is explicit nil, the zero value for {{vendorExtensions.x-go-base-type}} will be returned {{/isNullable}} +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Get{{name}}() {{vendorExtensions.x-go-base-type}} { if o == nil{{#isNullable}}{{^vendorExtensions.x-golang-is-container}} || o.{{name}}.Get() == nil{{/vendorExtensions.x-golang-is-container}}{{/isNullable}} { var ret {{vendorExtensions.x-go-base-type}} @@ -108,6 +114,9 @@ func (o *{{classname}}) Get{{name}}() {{vendorExtensions.x-go-base-type}} { {{#isNullable}} // NOTE: If the value is an explicit nil, `nil, true` will be returned {{/isNullable}} +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Get{{name}}Ok() (*{{vendorExtensions.x-go-base-type}}, bool) { if o == nil {{#isNullable}}{{#vendorExtensions.x-golang-is-container}}|| o.{{name}} == nil{{/vendorExtensions.x-golang-is-container}}{{/isNullable}} { return nil, false @@ -126,6 +135,9 @@ func (o *{{classname}}) Get{{name}}Ok() (*{{vendorExtensions.x-go-base-type}}, b } // Set{{name}} sets field value +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Set{{name}}(v {{vendorExtensions.x-go-base-type}}) { {{#isNullable}} {{#vendorExtensions.x-golang-is-container}} @@ -143,6 +155,9 @@ func (o *{{classname}}) Set{{name}}(v {{vendorExtensions.x-go-base-type}}) { {{/required}} {{^required}} // Get{{name}} returns the {{name}} field value if set, zero value otherwise{{#isNullable}} (both if not set or set to explicit null){{/isNullable}}. +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Get{{name}}() {{vendorExtensions.x-go-base-type}} { if o == nil {{^isNullable}}|| o.{{name}} == nil{{/isNullable}}{{#isNullable}}{{^vendorExtensions.x-golang-is-container}}|| o.{{name}}.Get() == nil{{/vendorExtensions.x-golang-is-container}}{{/isNullable}} { var ret {{vendorExtensions.x-go-base-type}} @@ -166,6 +181,9 @@ func (o *{{classname}}) Get{{name}}() {{vendorExtensions.x-go-base-type}} { {{#isNullable}} // NOTE: If the value is an explicit nil, `nil, true` will be returned {{/isNullable}} +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Get{{name}}Ok() (*{{vendorExtensions.x-go-base-type}}, bool) { if o == nil {{^isNullable}}|| o.{{name}} == nil{{/isNullable}}{{#isNullable}}{{#vendorExtensions.x-golang-is-container}}|| o.{{name}} == nil{{/vendorExtensions.x-golang-is-container}}{{/isNullable}} { return nil, false @@ -193,6 +211,9 @@ func (o *{{classname}}) Has{{name}}() bool { } // Set{{name}} gets a reference to the given {{dataType}} and assigns it to the {{name}} field. +{{#deprecated}} +// Deprecated +{{/deprecated}} func (o *{{classname}}) Set{{name}}(v {{vendorExtensions.x-go-base-type}}) { {{#isNullable}} {{#vendorExtensions.x-golang-is-container}} @@ -286,6 +307,9 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { {{#description}} // {{{description}}} {{/description}} + {{#deprecated}} + // Deprecated + {{/deprecated}} {{name}} {{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} } diff --git a/modules/openapi-generator/src/main/resources/go/partial_header.mustache b/modules/openapi-generator/src/main/resources/go/partial_header.mustache index ee1ead4cf39..d8f219cdfc4 100644 --- a/modules/openapi-generator/src/main/resources/go/partial_header.mustache +++ b/modules/openapi-generator/src/main/resources/go/partial_header.mustache @@ -1,18 +1,18 @@ /* - {{#appName}} - * {{{appName}}} - * - {{/appName}} - {{#appDescription}} - * {{{appDescription}}} - * - {{/appDescription}} - {{#version}} - * API version: {{{version}}} - {{/version}} - {{#infoEmail}} - * Contact: {{{infoEmail}}} - {{/infoEmail}} - */ +{{#appName}} +{{{.}}} + +{{/appName}} +{{#appDescription}} +{{{.}}} + +{{/appDescription}} +{{#version}} +API version: {{{.}}} +{{/version}} +{{#infoEmail}} +Contact: {{{.}}} +{{/infoEmail}} +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index 27083db4ad7..65be255ab75 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1252,6 +1252,7 @@ definitions: status: type: string description: pet status in the store + deprecated: true enum: - available - pending diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index b1490fa6798..eb0cbbda7f5 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -83,6 +83,7 @@ paths: required: true style: form explode: false + deprecated: true schema: type: array items: @@ -1346,6 +1347,7 @@ components: status: type: string description: pet status in the store + deprecated: true enum: - available - pending diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml index f5e98eec38d..c95d6dd6f55 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml @@ -85,6 +85,7 @@ paths: required: true style: form explode: false + deprecated: true schema: type: array items: @@ -716,6 +717,7 @@ components: status: type: string description: pet status in the store + deprecated: true enum: - available - pending diff --git a/samples/client/petstore/go/go-petstore/api_another_fake.go b/samples/client/petstore/go/go-petstore/api_another_fake.go index f97f8b7bcb1..c460926ef23 100644 --- a/samples/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/client/petstore/go/go-petstore/api_another_fake.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -26,17 +26,17 @@ var ( type AnotherFakeApi interface { /* - * Call123TestSpecialTags To test special tags - * To test special tags and operation ID starting with number - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCall123TestSpecialTagsRequest - */ + Call123TestSpecialTags To test special tags + + To test special tags and operation ID starting with number + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCall123TestSpecialTagsRequest + */ Call123TestSpecialTags(ctx _context.Context) ApiCall123TestSpecialTagsRequest - /* - * Call123TestSpecialTagsExecute executes the request - * @return Client - */ + // Call123TestSpecialTagsExecute executes the request + // @return Client Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) } @@ -49,6 +49,7 @@ type ApiCall123TestSpecialTagsRequest struct { body *Client } +// client model func (r ApiCall123TestSpecialTagsRequest) Body(body Client) ApiCall123TestSpecialTagsRequest { r.body = &body return r @@ -59,11 +60,13 @@ func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, } /* - * Call123TestSpecialTags To test special tags - * To test special tags and operation ID starting with number - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCall123TestSpecialTagsRequest - */ +Call123TestSpecialTags To test special tags + +To test special tags and operation ID starting with number + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCall123TestSpecialTagsRequest +*/ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) ApiCall123TestSpecialTagsRequest { return ApiCall123TestSpecialTagsRequest{ ApiService: a, @@ -71,10 +74,8 @@ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) Api } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go index 286d8c357ef..1ac3eb496a1 100644 --- a/samples/client/petstore/go/go-petstore/api_fake.go +++ b/samples/client/petstore/go/go-petstore/api_fake.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -29,190 +29,187 @@ var ( type FakeApi interface { /* - * CreateXmlItem creates an XmlItem - * this route creates an XmlItem - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateXmlItemRequest - */ + CreateXmlItem creates an XmlItem + + this route creates an XmlItem + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateXmlItemRequest + */ CreateXmlItem(ctx _context.Context) ApiCreateXmlItemRequest - /* - * CreateXmlItemExecute executes the request - */ + // CreateXmlItemExecute executes the request CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, error) /* - * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize - * Test serialization of outer boolean types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterBooleanSerializeRequest - */ + FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize + + Test serialization of outer boolean types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterBooleanSerializeRequest + */ FakeOuterBooleanSerialize(ctx _context.Context) ApiFakeOuterBooleanSerializeRequest - /* - * FakeOuterBooleanSerializeExecute executes the request - * @return bool - */ + // FakeOuterBooleanSerializeExecute executes the request + // @return bool FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) /* - * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize - * Test serialization of object with outer number type - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterCompositeSerializeRequest - */ + FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize + + Test serialization of object with outer number type + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterCompositeSerializeRequest + */ FakeOuterCompositeSerialize(ctx _context.Context) ApiFakeOuterCompositeSerializeRequest - /* - * FakeOuterCompositeSerializeExecute executes the request - * @return OuterComposite - */ + // FakeOuterCompositeSerializeExecute executes the request + // @return OuterComposite FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) /* - * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize - * Test serialization of outer number types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterNumberSerializeRequest - */ + FakeOuterNumberSerialize Method for FakeOuterNumberSerialize + + Test serialization of outer number types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterNumberSerializeRequest + */ FakeOuterNumberSerialize(ctx _context.Context) ApiFakeOuterNumberSerializeRequest - /* - * FakeOuterNumberSerializeExecute executes the request - * @return float32 - */ + // FakeOuterNumberSerializeExecute executes the request + // @return float32 FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) /* - * FakeOuterStringSerialize Method for FakeOuterStringSerialize - * Test serialization of outer string types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterStringSerializeRequest - */ + FakeOuterStringSerialize Method for FakeOuterStringSerialize + + Test serialization of outer string types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterStringSerializeRequest + */ FakeOuterStringSerialize(ctx _context.Context) ApiFakeOuterStringSerializeRequest - /* - * FakeOuterStringSerializeExecute executes the request - * @return string - */ + // FakeOuterStringSerializeExecute executes the request + // @return string FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) /* - * TestBodyWithFileSchema Method for TestBodyWithFileSchema - * For this test, the body for this request much reference a schema named `File`. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithFileSchemaRequest - */ + TestBodyWithFileSchema Method for TestBodyWithFileSchema + + For this test, the body for this request much reference a schema named `File`. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithFileSchemaRequest + */ TestBodyWithFileSchema(ctx _context.Context) ApiTestBodyWithFileSchemaRequest - /* - * TestBodyWithFileSchemaExecute executes the request - */ + // TestBodyWithFileSchemaExecute executes the request TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) /* - * TestBodyWithQueryParams Method for TestBodyWithQueryParams - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithQueryParamsRequest - */ + TestBodyWithQueryParams Method for TestBodyWithQueryParams + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithQueryParamsRequest + */ TestBodyWithQueryParams(ctx _context.Context) ApiTestBodyWithQueryParamsRequest - /* - * TestBodyWithQueryParamsExecute executes the request - */ + // TestBodyWithQueryParamsExecute executes the request TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) /* - * TestClientModel To test \"client\" model - * To test "client" model - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClientModelRequest - */ + TestClientModel To test \"client\" model + + To test "client" model + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClientModelRequest + */ TestClientModel(ctx _context.Context) ApiTestClientModelRequest - /* - * TestClientModelExecute executes the request - * @return Client - */ + // TestClientModelExecute executes the request + // @return Client TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) /* - * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters + TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + + Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEndpointParametersRequest - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEndpointParametersRequest + */ TestEndpointParameters(ctx _context.Context) ApiTestEndpointParametersRequest - /* - * TestEndpointParametersExecute executes the request - */ + // TestEndpointParametersExecute executes the request TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) /* - * TestEnumParameters To test enum parameters - * To test enum parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEnumParametersRequest - */ + TestEnumParameters To test enum parameters + + To test enum parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEnumParametersRequest + */ TestEnumParameters(ctx _context.Context) ApiTestEnumParametersRequest - /* - * TestEnumParametersExecute executes the request - */ + // TestEnumParametersExecute executes the request TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) /* - * TestGroupParameters Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestGroupParametersRequest - */ + TestGroupParameters Fake endpoint to test group parameters (optional) + + Fake endpoint to test group parameters (optional) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestGroupParametersRequest + */ TestGroupParameters(ctx _context.Context) ApiTestGroupParametersRequest - /* - * TestGroupParametersExecute executes the request - */ + // TestGroupParametersExecute executes the request TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) /* - * TestInlineAdditionalProperties test inline additionalProperties - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestInlineAdditionalPropertiesRequest - */ + TestInlineAdditionalProperties test inline additionalProperties + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestInlineAdditionalPropertiesRequest + */ TestInlineAdditionalProperties(ctx _context.Context) ApiTestInlineAdditionalPropertiesRequest - /* - * TestInlineAdditionalPropertiesExecute executes the request - */ + // TestInlineAdditionalPropertiesExecute executes the request TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) /* - * TestJsonFormData test json serialization of form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestJsonFormDataRequest - */ + TestJsonFormData test json serialization of form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestJsonFormDataRequest + */ TestJsonFormData(ctx _context.Context) ApiTestJsonFormDataRequest - /* - * TestJsonFormDataExecute executes the request - */ + // TestJsonFormDataExecute executes the request TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) /* - * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat - * To test the collection format in query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestQueryParameterCollectionFormatRequest - */ + TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat + + To test the collection format in query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestQueryParameterCollectionFormatRequest + */ TestQueryParameterCollectionFormat(ctx _context.Context) ApiTestQueryParameterCollectionFormatRequest - /* - * TestQueryParameterCollectionFormatExecute executes the request - */ + // TestQueryParameterCollectionFormatExecute executes the request TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) } @@ -225,6 +222,7 @@ type ApiCreateXmlItemRequest struct { xmlItem *XmlItem } +// XmlItem Body func (r ApiCreateXmlItemRequest) XmlItem(xmlItem XmlItem) ApiCreateXmlItemRequest { r.xmlItem = &xmlItem return r @@ -235,11 +233,13 @@ func (r ApiCreateXmlItemRequest) Execute() (*_nethttp.Response, error) { } /* - * CreateXmlItem creates an XmlItem - * this route creates an XmlItem - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateXmlItemRequest - */ +CreateXmlItem creates an XmlItem + +this route creates an XmlItem + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateXmlItemRequest +*/ func (a *FakeApiService) CreateXmlItem(ctx _context.Context) ApiCreateXmlItemRequest { return ApiCreateXmlItemRequest{ ApiService: a, @@ -247,9 +247,7 @@ func (a *FakeApiService) CreateXmlItem(ctx _context.Context) ApiCreateXmlItemReq } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -326,6 +324,7 @@ type ApiFakeOuterBooleanSerializeRequest struct { body *bool } +// Input boolean as post body func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBooleanSerializeRequest { r.body = &body return r @@ -336,11 +335,13 @@ func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response } /* - * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize - * Test serialization of outer boolean types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterBooleanSerializeRequest - */ +FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize + +Test serialization of outer boolean types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterBooleanSerializeRequest +*/ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFakeOuterBooleanSerializeRequest { return ApiFakeOuterBooleanSerializeRequest{ ApiService: a, @@ -348,10 +349,8 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFake } } -/* - * Execute executes the request - * @return bool - */ +// Execute executes the request +// @return bool func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -435,6 +434,7 @@ type ApiFakeOuterCompositeSerializeRequest struct { body *OuterComposite } +// Input composite as post body func (r ApiFakeOuterCompositeSerializeRequest) Body(body OuterComposite) ApiFakeOuterCompositeSerializeRequest { r.body = &body return r @@ -445,11 +445,13 @@ func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_neth } /* - * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize - * Test serialization of object with outer number type - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterCompositeSerializeRequest - */ +FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize + +Test serialization of object with outer number type + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterCompositeSerializeRequest +*/ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFakeOuterCompositeSerializeRequest { return ApiFakeOuterCompositeSerializeRequest{ ApiService: a, @@ -457,10 +459,8 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFa } } -/* - * Execute executes the request - * @return OuterComposite - */ +// Execute executes the request +// @return OuterComposite func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -544,6 +544,7 @@ type ApiFakeOuterNumberSerializeRequest struct { body *float32 } +// Input number as post body func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumberSerializeRequest { r.body = &body return r @@ -554,11 +555,13 @@ func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Respon } /* - * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize - * Test serialization of outer number types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterNumberSerializeRequest - */ +FakeOuterNumberSerialize Method for FakeOuterNumberSerialize + +Test serialization of outer number types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterNumberSerializeRequest +*/ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeOuterNumberSerializeRequest { return ApiFakeOuterNumberSerializeRequest{ ApiService: a, @@ -566,10 +569,8 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeO } } -/* - * Execute executes the request - * @return float32 - */ +// Execute executes the request +// @return float32 func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -653,6 +654,7 @@ type ApiFakeOuterStringSerializeRequest struct { body *string } +// Input string as post body func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterStringSerializeRequest { r.body = &body return r @@ -663,11 +665,13 @@ func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Respons } /* - * FakeOuterStringSerialize Method for FakeOuterStringSerialize - * Test serialization of outer string types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterStringSerializeRequest - */ +FakeOuterStringSerialize Method for FakeOuterStringSerialize + +Test serialization of outer string types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterStringSerializeRequest +*/ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeOuterStringSerializeRequest { return ApiFakeOuterStringSerializeRequest{ ApiService: a, @@ -675,10 +679,8 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeO } } -/* - * Execute executes the request - * @return string - */ +// Execute executes the request +// @return string func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -772,11 +774,13 @@ func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) } /* - * TestBodyWithFileSchema Method for TestBodyWithFileSchema - * For this test, the body for this request much reference a schema named `File`. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithFileSchemaRequest - */ +TestBodyWithFileSchema Method for TestBodyWithFileSchema + +For this test, the body for this request much reference a schema named `File`. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithFileSchemaRequest +*/ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBodyWithFileSchemaRequest { return ApiTestBodyWithFileSchemaRequest{ ApiService: a, @@ -784,9 +788,7 @@ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBod } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -878,10 +880,11 @@ func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) } /* - * TestBodyWithQueryParams Method for TestBodyWithQueryParams - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithQueryParamsRequest - */ +TestBodyWithQueryParams Method for TestBodyWithQueryParams + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithQueryParamsRequest +*/ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBodyWithQueryParamsRequest { return ApiTestBodyWithQueryParamsRequest{ ApiService: a, @@ -889,9 +892,7 @@ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBo } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -972,6 +973,7 @@ type ApiTestClientModelRequest struct { body *Client } +// client model func (r ApiTestClientModelRequest) Body(body Client) ApiTestClientModelRequest { r.body = &body return r @@ -982,11 +984,13 @@ func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) } /* - * TestClientModel To test \"client\" model - * To test "client" model - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClientModelRequest - */ +TestClientModel To test \"client\" model + +To test "client" model + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClientModelRequest +*/ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientModelRequest { return ApiTestClientModelRequest{ ApiService: a, @@ -994,10 +998,8 @@ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientMode } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch @@ -1097,58 +1099,72 @@ type ApiTestEndpointParametersRequest struct { callback *string } +// None func (r ApiTestEndpointParametersRequest) Number(number float32) ApiTestEndpointParametersRequest { r.number = &number return r } +// None func (r ApiTestEndpointParametersRequest) Double(double float64) ApiTestEndpointParametersRequest { r.double = &double return r } +// None func (r ApiTestEndpointParametersRequest) PatternWithoutDelimiter(patternWithoutDelimiter string) ApiTestEndpointParametersRequest { r.patternWithoutDelimiter = &patternWithoutDelimiter return r } +// None func (r ApiTestEndpointParametersRequest) Byte_(byte_ string) ApiTestEndpointParametersRequest { r.byte_ = &byte_ return r } +// None func (r ApiTestEndpointParametersRequest) Integer(integer int32) ApiTestEndpointParametersRequest { r.integer = &integer return r } +// None func (r ApiTestEndpointParametersRequest) Int32_(int32_ int32) ApiTestEndpointParametersRequest { r.int32_ = &int32_ return r } +// None func (r ApiTestEndpointParametersRequest) Int64_(int64_ int64) ApiTestEndpointParametersRequest { r.int64_ = &int64_ return r } +// None func (r ApiTestEndpointParametersRequest) Float(float float32) ApiTestEndpointParametersRequest { r.float = &float return r } +// None func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpointParametersRequest { r.string_ = &string_ return r } +// None func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest { r.binary = &binary return r } +// None func (r ApiTestEndpointParametersRequest) Date(date string) ApiTestEndpointParametersRequest { r.date = &date return r } +// None func (r ApiTestEndpointParametersRequest) DateTime(dateTime time.Time) ApiTestEndpointParametersRequest { r.dateTime = &dateTime return r } +// None func (r ApiTestEndpointParametersRequest) Password(password string) ApiTestEndpointParametersRequest { r.password = &password return r } +// None func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpointParametersRequest { r.callback = &callback return r @@ -1159,14 +1175,16 @@ func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) } /* - * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters +TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEndpointParametersRequest - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEndpointParametersRequest +*/ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEndpointParametersRequest { return ApiTestEndpointParametersRequest{ ApiService: a, @@ -1174,9 +1192,7 @@ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEnd } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1321,34 +1337,42 @@ type ApiTestEnumParametersRequest struct { enumFormString *string } +// Header parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []string) ApiTestEnumParametersRequest { r.enumHeaderStringArray = &enumHeaderStringArray return r } +// Header parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString string) ApiTestEnumParametersRequest { r.enumHeaderString = &enumHeaderString return r } +// Query parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []string) ApiTestEnumParametersRequest { r.enumQueryStringArray = &enumQueryStringArray return r } +// Query parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString string) ApiTestEnumParametersRequest { r.enumQueryString = &enumQueryString return r } +// Query parameter enum test (double) func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger int32) ApiTestEnumParametersRequest { r.enumQueryInteger = &enumQueryInteger return r } +// Query parameter enum test (double) func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble float64) ApiTestEnumParametersRequest { r.enumQueryDouble = &enumQueryDouble return r } +// Form parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []string) ApiTestEnumParametersRequest { r.enumFormStringArray = &enumFormStringArray return r } +// Form parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiTestEnumParametersRequest { r.enumFormString = &enumFormString return r @@ -1359,11 +1383,13 @@ func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) { } /* - * TestEnumParameters To test enum parameters - * To test enum parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEnumParametersRequest - */ +TestEnumParameters To test enum parameters + +To test enum parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEnumParametersRequest +*/ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumParametersRequest { return ApiTestEnumParametersRequest{ ApiService: a, @@ -1371,9 +1397,7 @@ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumPar } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -1474,26 +1498,32 @@ type ApiTestGroupParametersRequest struct { int64Group *int64 } +// Required String in group parameters func (r ApiTestGroupParametersRequest) RequiredStringGroup(requiredStringGroup int32) ApiTestGroupParametersRequest { r.requiredStringGroup = &requiredStringGroup return r } +// Required Boolean in group parameters func (r ApiTestGroupParametersRequest) RequiredBooleanGroup(requiredBooleanGroup bool) ApiTestGroupParametersRequest { r.requiredBooleanGroup = &requiredBooleanGroup return r } +// Required Integer in group parameters func (r ApiTestGroupParametersRequest) RequiredInt64Group(requiredInt64Group int64) ApiTestGroupParametersRequest { r.requiredInt64Group = &requiredInt64Group return r } +// String in group parameters func (r ApiTestGroupParametersRequest) StringGroup(stringGroup int32) ApiTestGroupParametersRequest { r.stringGroup = &stringGroup return r } +// Boolean in group parameters func (r ApiTestGroupParametersRequest) BooleanGroup(booleanGroup bool) ApiTestGroupParametersRequest { r.booleanGroup = &booleanGroup return r } +// Integer in group parameters func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroupParametersRequest { r.int64Group = &int64Group return r @@ -1504,11 +1534,13 @@ func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) { } /* - * TestGroupParameters Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestGroupParametersRequest - */ +TestGroupParameters Fake endpoint to test group parameters (optional) + +Fake endpoint to test group parameters (optional) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestGroupParametersRequest +*/ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupParametersRequest { return ApiTestGroupParametersRequest{ ApiService: a, @@ -1516,9 +1548,7 @@ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupP } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -1611,6 +1641,7 @@ type ApiTestInlineAdditionalPropertiesRequest struct { param *map[string]string } +// request body func (r ApiTestInlineAdditionalPropertiesRequest) Param(param map[string]string) ApiTestInlineAdditionalPropertiesRequest { r.param = ¶m return r @@ -1621,10 +1652,11 @@ func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, } /* - * TestInlineAdditionalProperties test inline additionalProperties - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestInlineAdditionalPropertiesRequest - */ +TestInlineAdditionalProperties test inline additionalProperties + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestInlineAdditionalPropertiesRequest +*/ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) ApiTestInlineAdditionalPropertiesRequest { return ApiTestInlineAdditionalPropertiesRequest{ ApiService: a, @@ -1632,9 +1664,7 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) Ap } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1712,10 +1742,12 @@ type ApiTestJsonFormDataRequest struct { param2 *string } +// field1 func (r ApiTestJsonFormDataRequest) Param(param string) ApiTestJsonFormDataRequest { r.param = ¶m return r } +// field2 func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataRequest { r.param2 = ¶m2 return r @@ -1726,10 +1758,11 @@ func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) { } /* - * TestJsonFormData test json serialization of form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestJsonFormDataRequest - */ +TestJsonFormData test json serialization of form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestJsonFormDataRequest +*/ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormDataRequest { return ApiTestJsonFormDataRequest{ ApiService: a, @@ -1737,9 +1770,7 @@ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormD } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -1849,11 +1880,13 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Respo } /* - * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat - * To test the collection format in query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestQueryParameterCollectionFormatRequest - */ +TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat + +To test the collection format in query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestQueryParameterCollectionFormatRequest +*/ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context) ApiTestQueryParameterCollectionFormatRequest { return ApiTestQueryParameterCollectionFormatRequest{ ApiService: a, @@ -1861,9 +1894,7 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut diff --git a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go index 967fd856e41..cc8592a1a78 100644 --- a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -26,17 +26,17 @@ var ( type FakeClassnameTags123Api interface { /* - * TestClassname To test class name in snake case - * To test class name in snake case - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClassnameRequest - */ + TestClassname To test class name in snake case + + To test class name in snake case + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClassnameRequest + */ TestClassname(ctx _context.Context) ApiTestClassnameRequest - /* - * TestClassnameExecute executes the request - * @return Client - */ + // TestClassnameExecute executes the request + // @return Client TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) } @@ -49,6 +49,7 @@ type ApiTestClassnameRequest struct { body *Client } +// client model func (r ApiTestClassnameRequest) Body(body Client) ApiTestClassnameRequest { r.body = &body return r @@ -59,11 +60,13 @@ func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) { } /* - * TestClassname To test class name in snake case - * To test class name in snake case - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClassnameRequest - */ +TestClassname To test class name in snake case + +To test class name in snake case + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClassnameRequest +*/ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) ApiTestClassnameRequest { return ApiTestClassnameRequest{ ApiService: a, @@ -71,10 +74,8 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) Api } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go index 73cf522a982..9e806f501e5 100644 --- a/samples/client/petstore/go/go-petstore/api_pet.go +++ b/samples/client/petstore/go/go-petstore/api_pet.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -28,124 +28,121 @@ var ( type PetApi interface { /* - * AddPet Add a new pet to the store - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiAddPetRequest - */ + AddPet Add a new pet to the store + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAddPetRequest + */ AddPet(ctx _context.Context) ApiAddPetRequest - /* - * AddPetExecute executes the request - */ + // AddPetExecute executes the request AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) /* - * DeletePet Deletes a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId Pet id to delete - * @return ApiDeletePetRequest - */ + DeletePet Deletes a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId Pet id to delete + @return ApiDeletePetRequest + */ DeletePet(ctx _context.Context, petId int64) ApiDeletePetRequest - /* - * DeletePetExecute executes the request - */ + // DeletePetExecute executes the request DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) /* - * FindPetsByStatus Finds Pets by status - * Multiple status values can be provided with comma separated strings - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByStatusRequest - */ + FindPetsByStatus Finds Pets by status + + Multiple status values can be provided with comma separated strings + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByStatusRequest + */ FindPetsByStatus(ctx _context.Context) ApiFindPetsByStatusRequest - /* - * FindPetsByStatusExecute executes the request - * @return []Pet - */ + // FindPetsByStatusExecute executes the request + // @return []Pet FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) /* - * FindPetsByTags Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByTagsRequest - */ + FindPetsByTags Finds Pets by tags + + Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByTagsRequest + + Deprecated + */ FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRequest - /* - * FindPetsByTagsExecute executes the request - * @return []Pet - */ + // FindPetsByTagsExecute executes the request + // @return []Pet + // Deprecated FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) /* - * GetPetById Find pet by ID - * Returns a single pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to return - * @return ApiGetPetByIdRequest - */ + GetPetById Find pet by ID + + Returns a single pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to return + @return ApiGetPetByIdRequest + */ GetPetById(ctx _context.Context, petId int64) ApiGetPetByIdRequest - /* - * GetPetByIdExecute executes the request - * @return Pet - */ + // GetPetByIdExecute executes the request + // @return Pet GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) /* - * UpdatePet Update an existing pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiUpdatePetRequest - */ + UpdatePet Update an existing pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiUpdatePetRequest + */ UpdatePet(ctx _context.Context) ApiUpdatePetRequest - /* - * UpdatePetExecute executes the request - */ + // UpdatePetExecute executes the request UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) /* - * UpdatePetWithForm Updates a pet in the store with form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet that needs to be updated - * @return ApiUpdatePetWithFormRequest - */ + UpdatePetWithForm Updates a pet in the store with form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet that needs to be updated + @return ApiUpdatePetWithFormRequest + */ UpdatePetWithForm(ctx _context.Context, petId int64) ApiUpdatePetWithFormRequest - /* - * UpdatePetWithFormExecute executes the request - */ + // UpdatePetWithFormExecute executes the request UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) /* - * UploadFile uploads an image - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileRequest - */ + UploadFile uploads an image + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileRequest + */ UploadFile(ctx _context.Context, petId int64) ApiUploadFileRequest - /* - * UploadFileExecute executes the request - * @return ApiResponse - */ + // UploadFileExecute executes the request + // @return ApiResponse UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) /* - * UploadFileWithRequiredFile uploads an image (required) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileWithRequiredFileRequest - */ + UploadFileWithRequiredFile uploads an image (required) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileWithRequiredFileRequest + */ UploadFileWithRequiredFile(ctx _context.Context, petId int64) ApiUploadFileWithRequiredFileRequest - /* - * UploadFileWithRequiredFileExecute executes the request - * @return ApiResponse - */ + // UploadFileWithRequiredFileExecute executes the request + // @return ApiResponse UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) } @@ -158,6 +155,7 @@ type ApiAddPetRequest struct { body *Pet } +// Pet object that needs to be added to the store func (r ApiAddPetRequest) Body(body Pet) ApiAddPetRequest { r.body = &body return r @@ -168,10 +166,11 @@ func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) { } /* - * AddPet Add a new pet to the store - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiAddPetRequest - */ +AddPet Add a new pet to the store + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAddPetRequest +*/ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { return ApiAddPetRequest{ ApiService: a, @@ -179,9 +178,7 @@ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -269,11 +266,12 @@ func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) { } /* - * DeletePet Deletes a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId Pet id to delete - * @return ApiDeletePetRequest - */ +DeletePet Deletes a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId Pet id to delete + @return ApiDeletePetRequest +*/ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePetRequest { return ApiDeletePetRequest{ ApiService: a, @@ -282,9 +280,7 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePe } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -360,6 +356,7 @@ type ApiFindPetsByStatusRequest struct { status *[]string } +// Status values that need to be considered for filter func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusRequest { r.status = &status return r @@ -370,11 +367,13 @@ func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) } /* - * FindPetsByStatus Finds Pets by status - * Multiple status values can be provided with comma separated strings - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByStatusRequest - */ +FindPetsByStatus Finds Pets by status + +Multiple status values can be provided with comma separated strings + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByStatusRequest +*/ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStatusRequest { return ApiFindPetsByStatusRequest{ ApiService: a, @@ -382,10 +381,8 @@ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStat } } -/* - * Execute executes the request - * @return []Pet - */ +// Execute executes the request +// @return []Pet func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -471,6 +468,7 @@ type ApiFindPetsByTagsRequest struct { tags *[]string } +// Tags to filter by func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest { r.tags = &tags return r @@ -481,11 +479,15 @@ func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) { } /* - * FindPetsByTags Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByTagsRequest - */ +FindPetsByTags Finds Pets by tags + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByTagsRequest + +Deprecated +*/ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRequest { return ApiFindPetsByTagsRequest{ ApiService: a, @@ -493,10 +495,9 @@ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRe } } -/* - * Execute executes the request - * @return []Pet - */ +// Execute executes the request +// @return []Pet +// Deprecated func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -588,12 +589,14 @@ func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) { } /* - * GetPetById Find pet by ID - * Returns a single pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to return - * @return ApiGetPetByIdRequest - */ +GetPetById Find pet by ID + +Returns a single pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to return + @return ApiGetPetByIdRequest +*/ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetByIdRequest { return ApiGetPetByIdRequest{ ApiService: a, @@ -602,10 +605,8 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetB } } -/* - * Execute executes the request - * @return Pet - */ +// Execute executes the request +// @return Pet func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -702,6 +703,7 @@ type ApiUpdatePetRequest struct { body *Pet } +// Pet object that needs to be added to the store func (r ApiUpdatePetRequest) Body(body Pet) ApiUpdatePetRequest { r.body = &body return r @@ -712,10 +714,11 @@ func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdatePet Update an existing pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiUpdatePetRequest - */ +UpdatePet Update an existing pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiUpdatePetRequest +*/ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { return ApiUpdatePetRequest{ ApiService: a, @@ -723,9 +726,7 @@ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -804,10 +805,12 @@ type ApiUpdatePetWithFormRequest struct { status *string } +// Updated name of the pet func (r ApiUpdatePetWithFormRequest) Name(name string) ApiUpdatePetWithFormRequest { r.name = &name return r } +// Updated status of the pet func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormRequest { r.status = &status return r @@ -818,11 +821,12 @@ func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdatePetWithForm Updates a pet in the store with form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet that needs to be updated - * @return ApiUpdatePetWithFormRequest - */ +UpdatePetWithForm Updates a pet in the store with form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet that needs to be updated + @return ApiUpdatePetWithFormRequest +*/ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) ApiUpdatePetWithFormRequest { return ApiUpdatePetWithFormRequest{ ApiService: a, @@ -831,9 +835,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) Api } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -914,10 +916,12 @@ type ApiUploadFileRequest struct { file **os.File } +// Additional data to pass to server func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiUploadFileRequest { r.additionalMetadata = &additionalMetadata return r } +// file to upload func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest { r.file = &file return r @@ -928,11 +932,12 @@ func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) } /* - * UploadFile uploads an image - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileRequest - */ +UploadFile uploads an image + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileRequest +*/ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadFileRequest { return ApiUploadFileRequest{ ApiService: a, @@ -941,10 +946,8 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadF } } -/* - * Execute executes the request - * @return ApiResponse - */ +// Execute executes the request +// @return ApiResponse func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1043,10 +1046,12 @@ type ApiUploadFileWithRequiredFileRequest struct { additionalMetadata *string } +// file to upload func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest { r.requiredFile = &requiredFile return r } +// Additional data to pass to server func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetadata string) ApiUploadFileWithRequiredFileRequest { r.additionalMetadata = &additionalMetadata return r @@ -1057,11 +1062,12 @@ func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp. } /* - * UploadFileWithRequiredFile uploads an image (required) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileWithRequiredFileRequest - */ +UploadFileWithRequiredFile uploads an image (required) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileWithRequiredFileRequest +*/ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId int64) ApiUploadFileWithRequiredFileRequest { return ApiUploadFileWithRequiredFileRequest{ ApiService: a, @@ -1070,10 +1076,8 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i } } -/* - * Execute executes the request - * @return ApiResponse - */ +// Execute executes the request +// @return ApiResponse func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go index e3120f0b246..0d31a9d574a 100644 --- a/samples/client/petstore/go/go-petstore/api_store.go +++ b/samples/client/petstore/go/go-petstore/api_store.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -27,59 +27,58 @@ var ( type StoreApi interface { /* - * DeleteOrder Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of the order that needs to be deleted - * @return ApiDeleteOrderRequest - */ + DeleteOrder Delete purchase order by ID + + For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of the order that needs to be deleted + @return ApiDeleteOrderRequest + */ DeleteOrder(ctx _context.Context, orderId string) ApiDeleteOrderRequest - /* - * DeleteOrderExecute executes the request - */ + // DeleteOrderExecute executes the request DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) /* - * GetInventory Returns pet inventories by status - * Returns a map of status codes to quantities - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiGetInventoryRequest - */ + GetInventory Returns pet inventories by status + + Returns a map of status codes to quantities + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiGetInventoryRequest + */ GetInventory(ctx _context.Context) ApiGetInventoryRequest - /* - * GetInventoryExecute executes the request - * @return map[string]int32 - */ + // GetInventoryExecute executes the request + // @return map[string]int32 GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) /* - * GetOrderById Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of pet that needs to be fetched - * @return ApiGetOrderByIdRequest - */ + GetOrderById Find purchase order by ID + + For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of pet that needs to be fetched + @return ApiGetOrderByIdRequest + */ GetOrderById(ctx _context.Context, orderId int64) ApiGetOrderByIdRequest - /* - * GetOrderByIdExecute executes the request - * @return Order - */ + // GetOrderByIdExecute executes the request + // @return Order GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) /* - * PlaceOrder Place an order for a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiPlaceOrderRequest - */ + PlaceOrder Place an order for a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiPlaceOrderRequest + */ PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest - /* - * PlaceOrderExecute executes the request - * @return Order - */ + // PlaceOrderExecute executes the request + // @return Order PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) } @@ -98,12 +97,14 @@ func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) { } /* - * DeleteOrder Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of the order that needs to be deleted - * @return ApiDeleteOrderRequest - */ +DeleteOrder Delete purchase order by ID + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of the order that needs to be deleted + @return ApiDeleteOrderRequest +*/ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiDeleteOrderRequest { return ApiDeleteOrderRequest{ ApiService: a, @@ -112,9 +113,7 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiD } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -192,11 +191,13 @@ func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, } /* - * GetInventory Returns pet inventories by status - * Returns a map of status codes to quantities - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiGetInventoryRequest - */ +GetInventory Returns pet inventories by status + +Returns a map of status codes to quantities + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiGetInventoryRequest +*/ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequest { return ApiGetInventoryRequest{ ApiService: a, @@ -204,10 +205,8 @@ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequ } } -/* - * Execute executes the request - * @return map[string]int32 - */ +// Execute executes the request +// @return map[string]int32 func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -309,12 +308,14 @@ func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) { } /* - * GetOrderById Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of pet that needs to be fetched - * @return ApiGetOrderByIdRequest - */ +GetOrderById Find purchase order by ID + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of pet that needs to be fetched + @return ApiGetOrderByIdRequest +*/ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiGetOrderByIdRequest { return ApiGetOrderByIdRequest{ ApiService: a, @@ -323,10 +324,8 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiG } } -/* - * Execute executes the request - * @return Order - */ +// Execute executes the request +// @return Order func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -415,6 +414,7 @@ type ApiPlaceOrderRequest struct { body *Order } +// order placed for purchasing the pet func (r ApiPlaceOrderRequest) Body(body Order) ApiPlaceOrderRequest { r.body = &body return r @@ -425,10 +425,11 @@ func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) { } /* - * PlaceOrder Place an order for a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiPlaceOrderRequest - */ +PlaceOrder Place an order for a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiPlaceOrderRequest +*/ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest { return ApiPlaceOrderRequest{ ApiService: a, @@ -436,10 +437,8 @@ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest } } -/* - * Execute executes the request - * @return Order - */ +// Execute executes the request +// @return Order func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost diff --git a/samples/client/petstore/go/go-petstore/api_user.go b/samples/client/petstore/go/go-petstore/api_user.go index 7e6d6991b80..b1f6a57f9c4 100644 --- a/samples/client/petstore/go/go-petstore/api_user.go +++ b/samples/client/petstore/go/go-petstore/api_user.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -27,107 +27,102 @@ var ( type UserApi interface { /* - * CreateUser Create user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUserRequest - */ + CreateUser Create user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUserRequest + */ CreateUser(ctx _context.Context) ApiCreateUserRequest - /* - * CreateUserExecute executes the request - */ + // CreateUserExecute executes the request CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) /* - * CreateUsersWithArrayInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithArrayInputRequest - */ + CreateUsersWithArrayInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithArrayInputRequest + */ CreateUsersWithArrayInput(ctx _context.Context) ApiCreateUsersWithArrayInputRequest - /* - * CreateUsersWithArrayInputExecute executes the request - */ + // CreateUsersWithArrayInputExecute executes the request CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) /* - * CreateUsersWithListInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithListInputRequest - */ + CreateUsersWithListInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithListInputRequest + */ CreateUsersWithListInput(ctx _context.Context) ApiCreateUsersWithListInputRequest - /* - * CreateUsersWithListInputExecute executes the request - */ + // CreateUsersWithListInputExecute executes the request CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) /* - * DeleteUser Delete user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be deleted - * @return ApiDeleteUserRequest - */ + DeleteUser Delete user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be deleted + @return ApiDeleteUserRequest + */ DeleteUser(ctx _context.Context, username string) ApiDeleteUserRequest - /* - * DeleteUserExecute executes the request - */ + // DeleteUserExecute executes the request DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) /* - * GetUserByName Get user by user name - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be fetched. Use user1 for testing. - * @return ApiGetUserByNameRequest - */ + GetUserByName Get user by user name + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be fetched. Use user1 for testing. + @return ApiGetUserByNameRequest + */ GetUserByName(ctx _context.Context, username string) ApiGetUserByNameRequest - /* - * GetUserByNameExecute executes the request - * @return User - */ + // GetUserByNameExecute executes the request + // @return User GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) /* - * LoginUser Logs user into the system - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLoginUserRequest - */ + LoginUser Logs user into the system + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLoginUserRequest + */ LoginUser(ctx _context.Context) ApiLoginUserRequest - /* - * LoginUserExecute executes the request - * @return string - */ + // LoginUserExecute executes the request + // @return string LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) /* - * LogoutUser Logs out current logged in user session - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLogoutUserRequest - */ + LogoutUser Logs out current logged in user session + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLogoutUserRequest + */ LogoutUser(ctx _context.Context) ApiLogoutUserRequest - /* - * LogoutUserExecute executes the request - */ + // LogoutUserExecute executes the request LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) /* - * UpdateUser Updated user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username name that need to be deleted - * @return ApiUpdateUserRequest - */ + UpdateUser Updated user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username name that need to be deleted + @return ApiUpdateUserRequest + */ UpdateUser(ctx _context.Context, username string) ApiUpdateUserRequest - /* - * UpdateUserExecute executes the request - */ + // UpdateUserExecute executes the request UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) } @@ -140,6 +135,7 @@ type ApiCreateUserRequest struct { body *User } +// Created user object func (r ApiCreateUserRequest) Body(body User) ApiCreateUserRequest { r.body = &body return r @@ -150,11 +146,13 @@ func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, error) { } /* - * CreateUser Create user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUserRequest - */ +CreateUser Create user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUserRequest +*/ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { return ApiCreateUserRequest{ ApiService: a, @@ -162,9 +160,7 @@ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -241,6 +237,7 @@ type ApiCreateUsersWithArrayInputRequest struct { body *[]User } +// List of user object func (r ApiCreateUsersWithArrayInputRequest) Body(body []User) ApiCreateUsersWithArrayInputRequest { r.body = &body return r @@ -251,10 +248,11 @@ func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, erro } /* - * CreateUsersWithArrayInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithArrayInputRequest - */ +CreateUsersWithArrayInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithArrayInputRequest +*/ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCreateUsersWithArrayInputRequest { return ApiCreateUsersWithArrayInputRequest{ ApiService: a, @@ -262,9 +260,7 @@ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCrea } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -341,6 +337,7 @@ type ApiCreateUsersWithListInputRequest struct { body *[]User } +// List of user object func (r ApiCreateUsersWithListInputRequest) Body(body []User) ApiCreateUsersWithListInputRequest { r.body = &body return r @@ -351,10 +348,11 @@ func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, error } /* - * CreateUsersWithListInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithListInputRequest - */ +CreateUsersWithListInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithListInputRequest +*/ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreateUsersWithListInputRequest { return ApiCreateUsersWithListInputRequest{ ApiService: a, @@ -362,9 +360,7 @@ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreat } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -447,12 +443,14 @@ func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, error) { } /* - * DeleteUser Delete user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be deleted - * @return ApiDeleteUserRequest - */ +DeleteUser Delete user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be deleted + @return ApiDeleteUserRequest +*/ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDeleteUserRequest { return ApiDeleteUserRequest{ ApiService: a, @@ -461,9 +459,7 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDe } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -542,11 +538,12 @@ func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) { } /* - * GetUserByName Get user by user name - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be fetched. Use user1 for testing. - * @return ApiGetUserByNameRequest - */ +GetUserByName Get user by user name + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be fetched. Use user1 for testing. + @return ApiGetUserByNameRequest +*/ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) ApiGetUserByNameRequest { return ApiGetUserByNameRequest{ ApiService: a, @@ -555,10 +552,8 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) Ap } } -/* - * Execute executes the request - * @return User - */ +// Execute executes the request +// @return User func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -642,10 +637,12 @@ type ApiLoginUserRequest struct { password *string } +// The user name for login func (r ApiLoginUserRequest) Username(username string) ApiLoginUserRequest { r.username = &username return r } +// The password for login in clear text func (r ApiLoginUserRequest) Password(password string) ApiLoginUserRequest { r.password = &password return r @@ -656,10 +653,11 @@ func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, error) { } /* - * LoginUser Logs user into the system - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLoginUserRequest - */ +LoginUser Logs user into the system + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLoginUserRequest +*/ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { return ApiLoginUserRequest{ ApiService: a, @@ -667,10 +665,8 @@ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { } } -/* - * Execute executes the request - * @return string - */ +// Execute executes the request +// @return string func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -765,10 +761,11 @@ func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, error) { } /* - * LogoutUser Logs out current logged in user session - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLogoutUserRequest - */ +LogoutUser Logs out current logged in user session + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLogoutUserRequest +*/ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { return ApiLogoutUserRequest{ ApiService: a, @@ -776,9 +773,7 @@ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -851,6 +846,7 @@ type ApiUpdateUserRequest struct { body *User } +// Updated user object func (r ApiUpdateUserRequest) Body(body User) ApiUpdateUserRequest { r.body = &body return r @@ -861,12 +857,14 @@ func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdateUser Updated user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username name that need to be deleted - * @return ApiUpdateUserRequest - */ +UpdateUser Updated user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username name that need to be deleted + @return ApiUpdateUserRequest +*/ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUpdateUserRequest { return ApiUpdateUserRequest{ ApiService: a, @@ -875,9 +873,7 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUp } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index 411570ac871..47bde2f8690 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/configuration.go b/samples/client/petstore/go/go-petstore/configuration.go index 80e1594314e..326eb245319 100644 --- a/samples/client/petstore/go/go-petstore/configuration.go +++ b/samples/client/petstore/go/go-petstore/configuration.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_200_response.go b/samples/client/petstore/go/go-petstore/model_200_response.go index d81033d6c1f..68e469454ae 100644 --- a/samples/client/petstore/go/go-petstore/model_200_response.go +++ b/samples/client/petstore/go/go-petstore/model_200_response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_any_type.go b/samples/client/petstore/go/go-petstore/model_additional_properties_any_type.go index e64cd6da8e8..ee9be1b1d87 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_any_type.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_any_type.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_array.go b/samples/client/petstore/go/go-petstore/model_additional_properties_array.go index 79ab0de4922..5d2cd29a4fc 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_array.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_array.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_boolean.go b/samples/client/petstore/go/go-petstore/model_additional_properties_boolean.go index ef9220a184b..eaa524de6a6 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_boolean.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_boolean.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_class.go b/samples/client/petstore/go/go-petstore/model_additional_properties_class.go index 70f862dd4c6..5b44d7e51ff 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_class.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_integer.go b/samples/client/petstore/go/go-petstore/model_additional_properties_integer.go index e69c3917200..d1e86c00c62 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_integer.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_integer.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_number.go b/samples/client/petstore/go/go-petstore/model_additional_properties_number.go index 7b126bb7608..6db900c29fc 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_number.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_number.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_object.go b/samples/client/petstore/go/go-petstore/model_additional_properties_object.go index c7755491ad1..ec78c54ca63 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_object.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_object.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_string.go b/samples/client/petstore/go/go-petstore/model_additional_properties_string.go index 9e8cf98a0c0..7856fc31558 100644 --- a/samples/client/petstore/go/go-petstore/model_additional_properties_string.go +++ b/samples/client/petstore/go/go-petstore/model_additional_properties_string.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_animal.go b/samples/client/petstore/go/go-petstore/model_animal.go index e6968a95e15..0c942ae9b86 100644 --- a/samples/client/petstore/go/go-petstore/model_animal.go +++ b/samples/client/petstore/go/go-petstore/model_animal.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_api_response.go b/samples/client/petstore/go/go-petstore/model_api_response.go index 1927c67baeb..216600a1e38 100644 --- a/samples/client/petstore/go/go-petstore/model_api_response.go +++ b/samples/client/petstore/go/go-petstore/model_api_response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go b/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go index 09f460e3677..29fbda5bfc8 100644 --- a/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go +++ b/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_array_of_number_only.go b/samples/client/petstore/go/go-petstore/model_array_of_number_only.go index 2872f6e50bb..1c6b5b2374b 100644 --- a/samples/client/petstore/go/go-petstore/model_array_of_number_only.go +++ b/samples/client/petstore/go/go-petstore/model_array_of_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_array_test_.go b/samples/client/petstore/go/go-petstore/model_array_test_.go index 393c2161a63..54f72759d3f 100644 --- a/samples/client/petstore/go/go-petstore/model_array_test_.go +++ b/samples/client/petstore/go/go-petstore/model_array_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_big_cat.go b/samples/client/petstore/go/go-petstore/model_big_cat.go index 7400d27f62e..70a5e4c76c2 100644 --- a/samples/client/petstore/go/go-petstore/model_big_cat.go +++ b/samples/client/petstore/go/go-petstore/model_big_cat.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_big_cat_all_of.go b/samples/client/petstore/go/go-petstore/model_big_cat_all_of.go index fc634788463..4d36af2a203 100644 --- a/samples/client/petstore/go/go-petstore/model_big_cat_all_of.go +++ b/samples/client/petstore/go/go-petstore/model_big_cat_all_of.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_capitalization.go b/samples/client/petstore/go/go-petstore/model_capitalization.go index d9d718c80e0..39d8987dd5c 100644 --- a/samples/client/petstore/go/go-petstore/model_capitalization.go +++ b/samples/client/petstore/go/go-petstore/model_capitalization.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_cat.go b/samples/client/petstore/go/go-petstore/model_cat.go index 88ebf1b620a..75f71f07623 100644 --- a/samples/client/petstore/go/go-petstore/model_cat.go +++ b/samples/client/petstore/go/go-petstore/model_cat.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_cat_all_of.go b/samples/client/petstore/go/go-petstore/model_cat_all_of.go index 5eb12f897e8..0a08b6b3476 100644 --- a/samples/client/petstore/go/go-petstore/model_cat_all_of.go +++ b/samples/client/petstore/go/go-petstore/model_cat_all_of.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_category.go b/samples/client/petstore/go/go-petstore/model_category.go index 91be54e66e4..53d14123e61 100644 --- a/samples/client/petstore/go/go-petstore/model_category.go +++ b/samples/client/petstore/go/go-petstore/model_category.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_class_model.go b/samples/client/petstore/go/go-petstore/model_class_model.go index 48328a82b85..b1d328e883f 100644 --- a/samples/client/petstore/go/go-petstore/model_class_model.go +++ b/samples/client/petstore/go/go-petstore/model_class_model.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_client.go b/samples/client/petstore/go/go-petstore/model_client.go index 37a83eefa32..0a441819fe1 100644 --- a/samples/client/petstore/go/go-petstore/model_client.go +++ b/samples/client/petstore/go/go-petstore/model_client.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_dog.go b/samples/client/petstore/go/go-petstore/model_dog.go index e920fc4a987..526597b6a66 100644 --- a/samples/client/petstore/go/go-petstore/model_dog.go +++ b/samples/client/petstore/go/go-petstore/model_dog.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_dog_all_of.go b/samples/client/petstore/go/go-petstore/model_dog_all_of.go index ab1f8b040c8..b73240b7cce 100644 --- a/samples/client/petstore/go/go-petstore/model_dog_all_of.go +++ b/samples/client/petstore/go/go-petstore/model_dog_all_of.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_enum_arrays.go b/samples/client/petstore/go/go-petstore/model_enum_arrays.go index 9dd9477a3b5..ed2f6e8b145 100644 --- a/samples/client/petstore/go/go-petstore/model_enum_arrays.go +++ b/samples/client/petstore/go/go-petstore/model_enum_arrays.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_enum_class.go b/samples/client/petstore/go/go-petstore/model_enum_class.go index 512004b7904..03f680f6ff3 100644 --- a/samples/client/petstore/go/go-petstore/model_enum_class.go +++ b/samples/client/petstore/go/go-petstore/model_enum_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_enum_test_.go b/samples/client/petstore/go/go-petstore/model_enum_test_.go index f8dda4314bc..c6d96da3d72 100644 --- a/samples/client/petstore/go/go-petstore/model_enum_test_.go +++ b/samples/client/petstore/go/go-petstore/model_enum_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_file.go b/samples/client/petstore/go/go-petstore/model_file.go index 9d110b00a06..54a580b87ea 100644 --- a/samples/client/petstore/go/go-petstore/model_file.go +++ b/samples/client/petstore/go/go-petstore/model_file.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_file_schema_test_class.go b/samples/client/petstore/go/go-petstore/model_file_schema_test_class.go index c9ea7666caa..78fbc5aa2c2 100644 --- a/samples/client/petstore/go/go-petstore/model_file_schema_test_class.go +++ b/samples/client/petstore/go/go-petstore/model_file_schema_test_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_format_test_.go b/samples/client/petstore/go/go-petstore/model_format_test_.go index cbf31097f5d..67f9fff47af 100644 --- a/samples/client/petstore/go/go-petstore/model_format_test_.go +++ b/samples/client/petstore/go/go-petstore/model_format_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_has_only_read_only.go b/samples/client/petstore/go/go-petstore/model_has_only_read_only.go index 7db904fae11..364faf15a4d 100644 --- a/samples/client/petstore/go/go-petstore/model_has_only_read_only.go +++ b/samples/client/petstore/go/go-petstore/model_has_only_read_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_list.go b/samples/client/petstore/go/go-petstore/model_list.go index 740d4585d1e..75487f7b030 100644 --- a/samples/client/petstore/go/go-petstore/model_list.go +++ b/samples/client/petstore/go/go-petstore/model_list.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_map_test_.go b/samples/client/petstore/go/go-petstore/model_map_test_.go index 28f299efba8..71e56a27d89 100644 --- a/samples/client/petstore/go/go-petstore/model_map_test_.go +++ b/samples/client/petstore/go/go-petstore/model_map_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go index ac54c800834..3d2a9b1dcaf 100644 --- a/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go +++ b/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_name.go b/samples/client/petstore/go/go-petstore/model_name.go index f9638d476b9..d423411e239 100644 --- a/samples/client/petstore/go/go-petstore/model_name.go +++ b/samples/client/petstore/go/go-petstore/model_name.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_number_only.go b/samples/client/petstore/go/go-petstore/model_number_only.go index aca9784bc88..5635629f38f 100644 --- a/samples/client/petstore/go/go-petstore/model_number_only.go +++ b/samples/client/petstore/go/go-petstore/model_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_order.go b/samples/client/petstore/go/go-petstore/model_order.go index bef34a6c859..fe097aa01ca 100644 --- a/samples/client/petstore/go/go-petstore/model_order.go +++ b/samples/client/petstore/go/go-petstore/model_order.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_outer_composite.go b/samples/client/petstore/go/go-petstore/model_outer_composite.go index 8679bfa7c96..77a0e226f70 100644 --- a/samples/client/petstore/go/go-petstore/model_outer_composite.go +++ b/samples/client/petstore/go/go-petstore/model_outer_composite.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_outer_enum.go b/samples/client/petstore/go/go-petstore/model_outer_enum.go index a381d0e7615..2c275f56e8d 100644 --- a/samples/client/petstore/go/go-petstore/model_outer_enum.go +++ b/samples/client/petstore/go/go-petstore/model_outer_enum.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_pet.go b/samples/client/petstore/go/go-petstore/model_pet.go index 6a2e1809e3a..2d07615cb4f 100644 --- a/samples/client/petstore/go/go-petstore/model_pet.go +++ b/samples/client/petstore/go/go-petstore/model_pet.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_read_only_first.go b/samples/client/petstore/go/go-petstore/model_read_only_first.go index aac74b8325e..23766a7a46b 100644 --- a/samples/client/petstore/go/go-petstore/model_read_only_first.go +++ b/samples/client/petstore/go/go-petstore/model_read_only_first.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_return.go b/samples/client/petstore/go/go-petstore/model_return.go index 7c7f14dbd09..3949d2e26bd 100644 --- a/samples/client/petstore/go/go-petstore/model_return.go +++ b/samples/client/petstore/go/go-petstore/model_return.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_special_model_name.go b/samples/client/petstore/go/go-petstore/model_special_model_name.go index 6b07421ad31..7f0535ee23c 100644 --- a/samples/client/petstore/go/go-petstore/model_special_model_name.go +++ b/samples/client/petstore/go/go-petstore/model_special_model_name.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_tag.go b/samples/client/petstore/go/go-petstore/model_tag.go index 68760aa1f80..ae0ed723b7c 100644 --- a/samples/client/petstore/go/go-petstore/model_tag.go +++ b/samples/client/petstore/go/go-petstore/model_tag.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_type_holder_default.go b/samples/client/petstore/go/go-petstore/model_type_holder_default.go index 11e394454bd..91d7c3014b6 100644 --- a/samples/client/petstore/go/go-petstore/model_type_holder_default.go +++ b/samples/client/petstore/go/go-petstore/model_type_holder_default.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_type_holder_example.go b/samples/client/petstore/go/go-petstore/model_type_holder_example.go index 81fbed36ed4..084c4d4c380 100644 --- a/samples/client/petstore/go/go-petstore/model_type_holder_example.go +++ b/samples/client/petstore/go/go-petstore/model_type_holder_example.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_user.go b/samples/client/petstore/go/go-petstore/model_user.go index b0591e9c894..01ab25a523b 100644 --- a/samples/client/petstore/go/go-petstore/model_user.go +++ b/samples/client/petstore/go/go-petstore/model_user.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/model_xml_item.go b/samples/client/petstore/go/go-petstore/model_xml_item.go index 0e0ccabb410..4d01502ae73 100644 --- a/samples/client/petstore/go/go-petstore/model_xml_item.go +++ b/samples/client/petstore/go/go-petstore/model_xml_item.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/response.go b/samples/client/petstore/go/go-petstore/response.go index d8189716b45..60c5d20ba46 100644 --- a/samples/client/petstore/go/go-petstore/response.go +++ b/samples/client/petstore/go/go-petstore/response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/go/go-petstore/utils.go b/samples/client/petstore/go/go-petstore/utils.go index b35436c11f5..db7f0c4651d 100644 --- a/samples/client/petstore/go/go-petstore/utils.go +++ b/samples/client/petstore/go/go-petstore/utils.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts index afcfb41b258..75ced82054b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts @@ -1101,6 +1101,7 @@ export interface Pet { * pet status in the store * @type {string} * @memberof Pet + * @deprecated */ status?: PetStatusEnum; } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go index 7afd8dc09c2..d98b721c83d 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go @@ -1,10 +1,10 @@ /* - * OpenAPI Extension x-auth-id-alias - * - * This specification shows how to use x-auth-id-alias extension for API keys. - * - * API version: 1.0.0 - */ +OpenAPI Extension x-auth-id-alias + +This specification shows how to use x-auth-id-alias extension for API keys. + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -37,11 +37,13 @@ func (r ApiAnyKeyRequest) Execute() (map[string]interface{}, *_nethttp.Response, } /* - * AnyKey Use any API key - * Use any API key - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiAnyKeyRequest - */ +AnyKey Use any API key + +Use any API key + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAnyKeyRequest +*/ func (a *UsageApiService) AnyKey(ctx _context.Context) ApiAnyKeyRequest { return ApiAnyKeyRequest{ ApiService: a, @@ -49,10 +51,8 @@ func (a *UsageApiService) AnyKey(ctx _context.Context) ApiAnyKeyRequest { } } -/* - * Execute executes the request - * @return map[string]interface{} - */ +// Execute executes the request +// @return map[string]interface{} func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -167,11 +167,13 @@ func (r ApiBothKeysRequest) Execute() (map[string]interface{}, *_nethttp.Respons } /* - * BothKeys Use both API keys - * Use both API keys - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiBothKeysRequest - */ +BothKeys Use both API keys + +Use both API keys + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiBothKeysRequest +*/ func (a *UsageApiService) BothKeys(ctx _context.Context) ApiBothKeysRequest { return ApiBothKeysRequest{ ApiService: a, @@ -179,10 +181,8 @@ func (a *UsageApiService) BothKeys(ctx _context.Context) ApiBothKeysRequest { } } -/* - * Execute executes the request - * @return map[string]interface{} - */ +// Execute executes the request +// @return map[string]interface{} func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -297,11 +297,13 @@ func (r ApiKeyInHeaderRequest) Execute() (map[string]interface{}, *_nethttp.Resp } /* - * KeyInHeader Use API key in header - * Use API key in header - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiKeyInHeaderRequest - */ +KeyInHeader Use API key in header + +Use API key in header + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiKeyInHeaderRequest +*/ func (a *UsageApiService) KeyInHeader(ctx _context.Context) ApiKeyInHeaderRequest { return ApiKeyInHeaderRequest{ ApiService: a, @@ -309,10 +311,8 @@ func (a *UsageApiService) KeyInHeader(ctx _context.Context) ApiKeyInHeaderReques } } -/* - * Execute executes the request - * @return map[string]interface{} - */ +// Execute executes the request +// @return map[string]interface{} func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -413,11 +413,13 @@ func (r ApiKeyInQueryRequest) Execute() (map[string]interface{}, *_nethttp.Respo } /* - * KeyInQuery Use API key in query - * Use API key in query - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiKeyInQueryRequest - */ +KeyInQuery Use API key in query + +Use API key in query + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiKeyInQueryRequest +*/ func (a *UsageApiService) KeyInQuery(ctx _context.Context) ApiKeyInQueryRequest { return ApiKeyInQueryRequest{ ApiService: a, @@ -425,10 +427,8 @@ func (a *UsageApiService) KeyInQuery(ctx _context.Context) ApiKeyInQueryRequest } } -/* - * Execute executes the request - * @return map[string]interface{} - */ +// Execute executes the request +// @return map[string]interface{} func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index 1d0dad0e27b..d025bb35fbc 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -1,10 +1,10 @@ /* - * OpenAPI Extension x-auth-id-alias - * - * This specification shows how to use x-auth-id-alias extension for API keys. - * - * API version: 1.0.0 - */ +OpenAPI Extension x-auth-id-alias + +This specification shows how to use x-auth-id-alias extension for API keys. + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/configuration.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/configuration.go index ebdb153ea4e..69e73c4ffe0 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/configuration.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/configuration.go @@ -1,10 +1,10 @@ /* - * OpenAPI Extension x-auth-id-alias - * - * This specification shows how to use x-auth-id-alias extension for API keys. - * - * API version: 1.0.0 - */ +OpenAPI Extension x-auth-id-alias + +This specification shows how to use x-auth-id-alias extension for API keys. + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/response.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/response.go index b7f655ebdf1..e645f0f8d69 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/response.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/response.go @@ -1,10 +1,10 @@ /* - * OpenAPI Extension x-auth-id-alias - * - * This specification shows how to use x-auth-id-alias extension for API keys. - * - * API version: 1.0.0 - */ +OpenAPI Extension x-auth-id-alias + +This specification shows how to use x-auth-id-alias extension for API keys. + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/utils.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/utils.go index 6678105bcc0..333051f2d09 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/utils.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/utils.go @@ -1,10 +1,10 @@ /* - * OpenAPI Extension x-auth-id-alias - * - * This specification shows how to use x-auth-id-alias extension for API keys. - * - * API version: 1.0.0 - */ +OpenAPI Extension x-auth-id-alias + +This specification shows how to use x-auth-id-alias extension for API keys. + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml index e0fba9d45fe..f380af4ae5c 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml @@ -93,7 +93,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -1440,6 +1441,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go index dea9b0888f9..7fd48ba7647 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -26,17 +26,17 @@ var ( type AnotherFakeApi interface { /* - * Call123TestSpecialTags To test special tags - * To test special tags and operation ID starting with number - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCall123TestSpecialTagsRequest - */ + Call123TestSpecialTags To test special tags + + To test special tags and operation ID starting with number + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCall123TestSpecialTagsRequest + */ Call123TestSpecialTags(ctx _context.Context) ApiCall123TestSpecialTagsRequest - /* - * Call123TestSpecialTagsExecute executes the request - * @return Client - */ + // Call123TestSpecialTagsExecute executes the request + // @return Client Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) } @@ -49,6 +49,7 @@ type ApiCall123TestSpecialTagsRequest struct { client *Client } +// client model func (r ApiCall123TestSpecialTagsRequest) Client(client Client) ApiCall123TestSpecialTagsRequest { r.client = &client return r @@ -59,11 +60,13 @@ func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, } /* - * Call123TestSpecialTags To test special tags - * To test special tags and operation ID starting with number - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCall123TestSpecialTagsRequest - */ +Call123TestSpecialTags To test special tags + +To test special tags and operation ID starting with number + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCall123TestSpecialTagsRequest +*/ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) ApiCall123TestSpecialTagsRequest { return ApiCall123TestSpecialTagsRequest{ ApiService: a, @@ -71,10 +74,8 @@ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) Api } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_default.go b/samples/openapi3/client/petstore/go/go-petstore/api_default.go index df07b59b2a7..22d87f42916 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_default.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_default.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -26,16 +26,15 @@ var ( type DefaultApi interface { /* - * FooGet Method for FooGet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFooGetRequest - */ + FooGet Method for FooGet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFooGetRequest + */ FooGet(ctx _context.Context) ApiFooGetRequest - /* - * FooGetExecute executes the request - * @return InlineResponseDefault - */ + // FooGetExecute executes the request + // @return InlineResponseDefault FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, error) } @@ -53,10 +52,11 @@ func (r ApiFooGetRequest) Execute() (InlineResponseDefault, *_nethttp.Response, } /* - * FooGet Method for FooGet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFooGetRequest - */ +FooGet Method for FooGet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFooGetRequest +*/ func (a *DefaultApiService) FooGet(ctx _context.Context) ApiFooGetRequest { return ApiFooGetRequest{ ApiService: a, @@ -64,10 +64,8 @@ func (a *DefaultApiService) FooGet(ctx _context.Context) ApiFooGetRequest { } } -/* - * Execute executes the request - * @return InlineResponseDefault - */ +// Execute executes the request +// @return InlineResponseDefault func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go index 0780536bcbb..ac3055bfb6e 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -29,205 +29,201 @@ var ( type FakeApi interface { /* - * FakeHealthGet Health check endpoint - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeHealthGetRequest - */ + FakeHealthGet Health check endpoint + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeHealthGetRequest + */ FakeHealthGet(ctx _context.Context) ApiFakeHealthGetRequest - /* - * FakeHealthGetExecute executes the request - * @return HealthCheckResult - */ + // FakeHealthGetExecute executes the request + // @return HealthCheckResult FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, error) /* - * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize - * Test serialization of outer boolean types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterBooleanSerializeRequest - */ + FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize + + Test serialization of outer boolean types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterBooleanSerializeRequest + */ FakeOuterBooleanSerialize(ctx _context.Context) ApiFakeOuterBooleanSerializeRequest - /* - * FakeOuterBooleanSerializeExecute executes the request - * @return bool - */ + // FakeOuterBooleanSerializeExecute executes the request + // @return bool FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) /* - * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize - * Test serialization of object with outer number type - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterCompositeSerializeRequest - */ + FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize + + Test serialization of object with outer number type + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterCompositeSerializeRequest + */ FakeOuterCompositeSerialize(ctx _context.Context) ApiFakeOuterCompositeSerializeRequest - /* - * FakeOuterCompositeSerializeExecute executes the request - * @return OuterComposite - */ + // FakeOuterCompositeSerializeExecute executes the request + // @return OuterComposite FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) /* - * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize - * Test serialization of outer number types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterNumberSerializeRequest - */ + FakeOuterNumberSerialize Method for FakeOuterNumberSerialize + + Test serialization of outer number types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterNumberSerializeRequest + */ FakeOuterNumberSerialize(ctx _context.Context) ApiFakeOuterNumberSerializeRequest - /* - * FakeOuterNumberSerializeExecute executes the request - * @return float32 - */ + // FakeOuterNumberSerializeExecute executes the request + // @return float32 FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) /* - * FakeOuterStringSerialize Method for FakeOuterStringSerialize - * Test serialization of outer string types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterStringSerializeRequest - */ + FakeOuterStringSerialize Method for FakeOuterStringSerialize + + Test serialization of outer string types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterStringSerializeRequest + */ FakeOuterStringSerialize(ctx _context.Context) ApiFakeOuterStringSerializeRequest - /* - * FakeOuterStringSerializeExecute executes the request - * @return string - */ + // FakeOuterStringSerializeExecute executes the request + // @return string FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) /* - * TestBodyWithFileSchema Method for TestBodyWithFileSchema - * For this test, the body for this request much reference a schema named `File`. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithFileSchemaRequest - */ + TestBodyWithFileSchema Method for TestBodyWithFileSchema + + For this test, the body for this request much reference a schema named `File`. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithFileSchemaRequest + */ TestBodyWithFileSchema(ctx _context.Context) ApiTestBodyWithFileSchemaRequest - /* - * TestBodyWithFileSchemaExecute executes the request - */ + // TestBodyWithFileSchemaExecute executes the request TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) /* - * TestBodyWithQueryParams Method for TestBodyWithQueryParams - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithQueryParamsRequest - */ + TestBodyWithQueryParams Method for TestBodyWithQueryParams + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithQueryParamsRequest + */ TestBodyWithQueryParams(ctx _context.Context) ApiTestBodyWithQueryParamsRequest - /* - * TestBodyWithQueryParamsExecute executes the request - */ + // TestBodyWithQueryParamsExecute executes the request TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) /* - * TestClientModel To test \"client\" model - * To test "client" model - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClientModelRequest - */ + TestClientModel To test \"client\" model + + To test "client" model + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClientModelRequest + */ TestClientModel(ctx _context.Context) ApiTestClientModelRequest - /* - * TestClientModelExecute executes the request - * @return Client - */ + // TestClientModelExecute executes the request + // @return Client TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) /* - * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters + TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + + Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEndpointParametersRequest - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEndpointParametersRequest + */ TestEndpointParameters(ctx _context.Context) ApiTestEndpointParametersRequest - /* - * TestEndpointParametersExecute executes the request - */ + // TestEndpointParametersExecute executes the request TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) /* - * TestEnumParameters To test enum parameters - * To test enum parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEnumParametersRequest - */ + TestEnumParameters To test enum parameters + + To test enum parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEnumParametersRequest + */ TestEnumParameters(ctx _context.Context) ApiTestEnumParametersRequest - /* - * TestEnumParametersExecute executes the request - */ + // TestEnumParametersExecute executes the request TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) /* - * TestGroupParameters Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestGroupParametersRequest - */ + TestGroupParameters Fake endpoint to test group parameters (optional) + + Fake endpoint to test group parameters (optional) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestGroupParametersRequest + */ TestGroupParameters(ctx _context.Context) ApiTestGroupParametersRequest - /* - * TestGroupParametersExecute executes the request - */ + // TestGroupParametersExecute executes the request TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) /* - * TestInlineAdditionalProperties test inline additionalProperties - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestInlineAdditionalPropertiesRequest - */ + TestInlineAdditionalProperties test inline additionalProperties + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestInlineAdditionalPropertiesRequest + */ TestInlineAdditionalProperties(ctx _context.Context) ApiTestInlineAdditionalPropertiesRequest - /* - * TestInlineAdditionalPropertiesExecute executes the request - */ + // TestInlineAdditionalPropertiesExecute executes the request TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) /* - * TestJsonFormData test json serialization of form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestJsonFormDataRequest - */ + TestJsonFormData test json serialization of form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestJsonFormDataRequest + */ TestJsonFormData(ctx _context.Context) ApiTestJsonFormDataRequest - /* - * TestJsonFormDataExecute executes the request - */ + // TestJsonFormDataExecute executes the request TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) /* - * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat - * To test the collection format in query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestQueryParameterCollectionFormatRequest - */ + TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat + + To test the collection format in query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestQueryParameterCollectionFormatRequest + */ TestQueryParameterCollectionFormat(ctx _context.Context) ApiTestQueryParameterCollectionFormatRequest - /* - * TestQueryParameterCollectionFormatExecute executes the request - */ + // TestQueryParameterCollectionFormatExecute executes the request TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) /* - * TestUniqueItemsHeaderAndQueryParameterCollectionFormat Method for TestUniqueItemsHeaderAndQueryParameterCollectionFormat - * To test unique items in header and query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest - */ + TestUniqueItemsHeaderAndQueryParameterCollectionFormat Method for TestUniqueItemsHeaderAndQueryParameterCollectionFormat + + To test unique items in header and query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest + */ TestUniqueItemsHeaderAndQueryParameterCollectionFormat(ctx _context.Context) ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest - /* - * TestUniqueItemsHeaderAndQueryParameterCollectionFormatExecute executes the request - * @return []Pet - */ + // TestUniqueItemsHeaderAndQueryParameterCollectionFormatExecute executes the request + // @return []Pet TestUniqueItemsHeaderAndQueryParameterCollectionFormatExecute(r ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest) ([]Pet, *_nethttp.Response, error) } @@ -245,10 +241,11 @@ func (r ApiFakeHealthGetRequest) Execute() (HealthCheckResult, *_nethttp.Respons } /* - * FakeHealthGet Health check endpoint - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeHealthGetRequest - */ +FakeHealthGet Health check endpoint + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeHealthGetRequest +*/ func (a *FakeApiService) FakeHealthGet(ctx _context.Context) ApiFakeHealthGetRequest { return ApiFakeHealthGetRequest{ ApiService: a, @@ -256,10 +253,8 @@ func (a *FakeApiService) FakeHealthGet(ctx _context.Context) ApiFakeHealthGetReq } } -/* - * Execute executes the request - * @return HealthCheckResult - */ +// Execute executes the request +// @return HealthCheckResult func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -341,6 +336,7 @@ type ApiFakeOuterBooleanSerializeRequest struct { body *bool } +// Input boolean as post body func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBooleanSerializeRequest { r.body = &body return r @@ -351,11 +347,13 @@ func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response } /* - * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize - * Test serialization of outer boolean types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterBooleanSerializeRequest - */ +FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize + +Test serialization of outer boolean types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterBooleanSerializeRequest +*/ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFakeOuterBooleanSerializeRequest { return ApiFakeOuterBooleanSerializeRequest{ ApiService: a, @@ -363,10 +361,8 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFake } } -/* - * Execute executes the request - * @return bool - */ +// Execute executes the request +// @return bool func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -450,6 +446,7 @@ type ApiFakeOuterCompositeSerializeRequest struct { outerComposite *OuterComposite } +// Input composite as post body func (r ApiFakeOuterCompositeSerializeRequest) OuterComposite(outerComposite OuterComposite) ApiFakeOuterCompositeSerializeRequest { r.outerComposite = &outerComposite return r @@ -460,11 +457,13 @@ func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_neth } /* - * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize - * Test serialization of object with outer number type - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterCompositeSerializeRequest - */ +FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize + +Test serialization of object with outer number type + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterCompositeSerializeRequest +*/ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFakeOuterCompositeSerializeRequest { return ApiFakeOuterCompositeSerializeRequest{ ApiService: a, @@ -472,10 +471,8 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFa } } -/* - * Execute executes the request - * @return OuterComposite - */ +// Execute executes the request +// @return OuterComposite func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -559,6 +556,7 @@ type ApiFakeOuterNumberSerializeRequest struct { body *float32 } +// Input number as post body func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumberSerializeRequest { r.body = &body return r @@ -569,11 +567,13 @@ func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Respon } /* - * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize - * Test serialization of outer number types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterNumberSerializeRequest - */ +FakeOuterNumberSerialize Method for FakeOuterNumberSerialize + +Test serialization of outer number types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterNumberSerializeRequest +*/ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeOuterNumberSerializeRequest { return ApiFakeOuterNumberSerializeRequest{ ApiService: a, @@ -581,10 +581,8 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeO } } -/* - * Execute executes the request - * @return float32 - */ +// Execute executes the request +// @return float32 func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -668,6 +666,7 @@ type ApiFakeOuterStringSerializeRequest struct { body *string } +// Input string as post body func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterStringSerializeRequest { r.body = &body return r @@ -678,11 +677,13 @@ func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Respons } /* - * FakeOuterStringSerialize Method for FakeOuterStringSerialize - * Test serialization of outer string types - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFakeOuterStringSerializeRequest - */ +FakeOuterStringSerialize Method for FakeOuterStringSerialize + +Test serialization of outer string types + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFakeOuterStringSerializeRequest +*/ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeOuterStringSerializeRequest { return ApiFakeOuterStringSerializeRequest{ ApiService: a, @@ -690,10 +691,8 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeO } } -/* - * Execute executes the request - * @return string - */ +// Execute executes the request +// @return string func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -787,11 +786,13 @@ func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) } /* - * TestBodyWithFileSchema Method for TestBodyWithFileSchema - * For this test, the body for this request much reference a schema named `File`. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithFileSchemaRequest - */ +TestBodyWithFileSchema Method for TestBodyWithFileSchema + +For this test, the body for this request much reference a schema named `File`. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithFileSchemaRequest +*/ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBodyWithFileSchemaRequest { return ApiTestBodyWithFileSchemaRequest{ ApiService: a, @@ -799,9 +800,7 @@ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBod } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -893,10 +892,11 @@ func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) } /* - * TestBodyWithQueryParams Method for TestBodyWithQueryParams - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestBodyWithQueryParamsRequest - */ +TestBodyWithQueryParams Method for TestBodyWithQueryParams + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestBodyWithQueryParamsRequest +*/ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBodyWithQueryParamsRequest { return ApiTestBodyWithQueryParamsRequest{ ApiService: a, @@ -904,9 +904,7 @@ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBo } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -987,6 +985,7 @@ type ApiTestClientModelRequest struct { client *Client } +// client model func (r ApiTestClientModelRequest) Client(client Client) ApiTestClientModelRequest { r.client = &client return r @@ -997,11 +996,13 @@ func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) } /* - * TestClientModel To test \"client\" model - * To test "client" model - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClientModelRequest - */ +TestClientModel To test \"client\" model + +To test "client" model + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClientModelRequest +*/ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientModelRequest { return ApiTestClientModelRequest{ ApiService: a, @@ -1009,10 +1010,8 @@ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientMode } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch @@ -1112,58 +1111,72 @@ type ApiTestEndpointParametersRequest struct { callback *string } +// None func (r ApiTestEndpointParametersRequest) Number(number float32) ApiTestEndpointParametersRequest { r.number = &number return r } +// None func (r ApiTestEndpointParametersRequest) Double(double float64) ApiTestEndpointParametersRequest { r.double = &double return r } +// None func (r ApiTestEndpointParametersRequest) PatternWithoutDelimiter(patternWithoutDelimiter string) ApiTestEndpointParametersRequest { r.patternWithoutDelimiter = &patternWithoutDelimiter return r } +// None func (r ApiTestEndpointParametersRequest) Byte_(byte_ string) ApiTestEndpointParametersRequest { r.byte_ = &byte_ return r } +// None func (r ApiTestEndpointParametersRequest) Integer(integer int32) ApiTestEndpointParametersRequest { r.integer = &integer return r } +// None func (r ApiTestEndpointParametersRequest) Int32_(int32_ int32) ApiTestEndpointParametersRequest { r.int32_ = &int32_ return r } +// None func (r ApiTestEndpointParametersRequest) Int64_(int64_ int64) ApiTestEndpointParametersRequest { r.int64_ = &int64_ return r } +// None func (r ApiTestEndpointParametersRequest) Float(float float32) ApiTestEndpointParametersRequest { r.float = &float return r } +// None func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpointParametersRequest { r.string_ = &string_ return r } +// None func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest { r.binary = &binary return r } +// None func (r ApiTestEndpointParametersRequest) Date(date string) ApiTestEndpointParametersRequest { r.date = &date return r } +// None func (r ApiTestEndpointParametersRequest) DateTime(dateTime time.Time) ApiTestEndpointParametersRequest { r.dateTime = &dateTime return r } +// None func (r ApiTestEndpointParametersRequest) Password(password string) ApiTestEndpointParametersRequest { r.password = &password return r } +// None func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpointParametersRequest { r.callback = &callback return r @@ -1174,15 +1187,17 @@ func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) } /* - * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters +TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEndpointParametersRequest - */ + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEndpointParametersRequest +*/ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEndpointParametersRequest { return ApiTestEndpointParametersRequest{ ApiService: a, @@ -1190,9 +1205,7 @@ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEnd } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1337,34 +1350,42 @@ type ApiTestEnumParametersRequest struct { enumFormString *string } +// Header parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []string) ApiTestEnumParametersRequest { r.enumHeaderStringArray = &enumHeaderStringArray return r } +// Header parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString string) ApiTestEnumParametersRequest { r.enumHeaderString = &enumHeaderString return r } +// Query parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []string) ApiTestEnumParametersRequest { r.enumQueryStringArray = &enumQueryStringArray return r } +// Query parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString string) ApiTestEnumParametersRequest { r.enumQueryString = &enumQueryString return r } +// Query parameter enum test (double) func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger int32) ApiTestEnumParametersRequest { r.enumQueryInteger = &enumQueryInteger return r } +// Query parameter enum test (double) func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble float64) ApiTestEnumParametersRequest { r.enumQueryDouble = &enumQueryDouble return r } +// Form parameter enum test (string array) func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []string) ApiTestEnumParametersRequest { r.enumFormStringArray = &enumFormStringArray return r } +// Form parameter enum test (string) func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiTestEnumParametersRequest { r.enumFormString = &enumFormString return r @@ -1375,11 +1396,13 @@ func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) { } /* - * TestEnumParameters To test enum parameters - * To test enum parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestEnumParametersRequest - */ +TestEnumParameters To test enum parameters + +To test enum parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestEnumParametersRequest +*/ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumParametersRequest { return ApiTestEnumParametersRequest{ ApiService: a, @@ -1387,9 +1410,7 @@ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumPar } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -1498,26 +1519,32 @@ type ApiTestGroupParametersRequest struct { int64Group *int64 } +// Required String in group parameters func (r ApiTestGroupParametersRequest) RequiredStringGroup(requiredStringGroup int32) ApiTestGroupParametersRequest { r.requiredStringGroup = &requiredStringGroup return r } +// Required Boolean in group parameters func (r ApiTestGroupParametersRequest) RequiredBooleanGroup(requiredBooleanGroup bool) ApiTestGroupParametersRequest { r.requiredBooleanGroup = &requiredBooleanGroup return r } +// Required Integer in group parameters func (r ApiTestGroupParametersRequest) RequiredInt64Group(requiredInt64Group int64) ApiTestGroupParametersRequest { r.requiredInt64Group = &requiredInt64Group return r } +// String in group parameters func (r ApiTestGroupParametersRequest) StringGroup(stringGroup int32) ApiTestGroupParametersRequest { r.stringGroup = &stringGroup return r } +// Boolean in group parameters func (r ApiTestGroupParametersRequest) BooleanGroup(booleanGroup bool) ApiTestGroupParametersRequest { r.booleanGroup = &booleanGroup return r } +// Integer in group parameters func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroupParametersRequest { r.int64Group = &int64Group return r @@ -1528,11 +1555,13 @@ func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) { } /* - * TestGroupParameters Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestGroupParametersRequest - */ +TestGroupParameters Fake endpoint to test group parameters (optional) + +Fake endpoint to test group parameters (optional) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestGroupParametersRequest +*/ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupParametersRequest { return ApiTestGroupParametersRequest{ ApiService: a, @@ -1540,9 +1569,7 @@ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupP } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -1635,6 +1662,7 @@ type ApiTestInlineAdditionalPropertiesRequest struct { requestBody *map[string]string } +// request body func (r ApiTestInlineAdditionalPropertiesRequest) RequestBody(requestBody map[string]string) ApiTestInlineAdditionalPropertiesRequest { r.requestBody = &requestBody return r @@ -1645,10 +1673,11 @@ func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, } /* - * TestInlineAdditionalProperties test inline additionalProperties - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestInlineAdditionalPropertiesRequest - */ +TestInlineAdditionalProperties test inline additionalProperties + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestInlineAdditionalPropertiesRequest +*/ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) ApiTestInlineAdditionalPropertiesRequest { return ApiTestInlineAdditionalPropertiesRequest{ ApiService: a, @@ -1656,9 +1685,7 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) Ap } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1736,10 +1763,12 @@ type ApiTestJsonFormDataRequest struct { param2 *string } +// field1 func (r ApiTestJsonFormDataRequest) Param(param string) ApiTestJsonFormDataRequest { r.param = ¶m return r } +// field2 func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataRequest { r.param2 = ¶m2 return r @@ -1750,10 +1779,11 @@ func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) { } /* - * TestJsonFormData test json serialization of form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestJsonFormDataRequest - */ +TestJsonFormData test json serialization of form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestJsonFormDataRequest +*/ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormDataRequest { return ApiTestJsonFormDataRequest{ ApiService: a, @@ -1761,9 +1791,7 @@ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormD } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -1873,11 +1901,13 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Respo } /* - * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat - * To test the collection format in query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestQueryParameterCollectionFormatRequest - */ +TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat + +To test the collection format in query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestQueryParameterCollectionFormatRequest +*/ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context) ApiTestQueryParameterCollectionFormatRequest { return ApiTestQueryParameterCollectionFormatRequest{ ApiService: a, @@ -1885,9 +1915,7 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -2014,11 +2042,13 @@ func (r ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest) Execut } /* - * TestUniqueItemsHeaderAndQueryParameterCollectionFormat Method for TestUniqueItemsHeaderAndQueryParameterCollectionFormat - * To test unique items in header and query parameters - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest - */ +TestUniqueItemsHeaderAndQueryParameterCollectionFormat Method for TestUniqueItemsHeaderAndQueryParameterCollectionFormat + +To test unique items in header and query parameters + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest +*/ func (a *FakeApiService) TestUniqueItemsHeaderAndQueryParameterCollectionFormat(ctx _context.Context) ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest { return ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest{ ApiService: a, @@ -2026,10 +2056,8 @@ func (a *FakeApiService) TestUniqueItemsHeaderAndQueryParameterCollectionFormat( } } -/* - * Execute executes the request - * @return []Pet - */ +// Execute executes the request +// @return []Pet func (a *FakeApiService) TestUniqueItemsHeaderAndQueryParameterCollectionFormatExecute(r ApiTestUniqueItemsHeaderAndQueryParameterCollectionFormatRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go index f60d6c06e2d..2ddc5ebf7da 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -26,17 +26,17 @@ var ( type FakeClassnameTags123Api interface { /* - * TestClassname To test class name in snake case - * To test class name in snake case - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClassnameRequest - */ + TestClassname To test class name in snake case + + To test class name in snake case + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClassnameRequest + */ TestClassname(ctx _context.Context) ApiTestClassnameRequest - /* - * TestClassnameExecute executes the request - * @return Client - */ + // TestClassnameExecute executes the request + // @return Client TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) } @@ -49,6 +49,7 @@ type ApiTestClassnameRequest struct { client *Client } +// client model func (r ApiTestClassnameRequest) Client(client Client) ApiTestClassnameRequest { r.client = &client return r @@ -59,11 +60,13 @@ func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) { } /* - * TestClassname To test class name in snake case - * To test class name in snake case - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiTestClassnameRequest - */ +TestClassname To test class name in snake case + +To test class name in snake case + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiTestClassnameRequest +*/ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) ApiTestClassnameRequest { return ApiTestClassnameRequest{ ApiService: a, @@ -71,10 +74,8 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) Api } } -/* - * Execute executes the request - * @return Client - */ +// Execute executes the request +// @return Client func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go index 06bddb5dc12..9f172c3cd30 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -28,124 +28,121 @@ var ( type PetApi interface { /* - * AddPet Add a new pet to the store - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiAddPetRequest - */ + AddPet Add a new pet to the store + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAddPetRequest + */ AddPet(ctx _context.Context) ApiAddPetRequest - /* - * AddPetExecute executes the request - */ + // AddPetExecute executes the request AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) /* - * DeletePet Deletes a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId Pet id to delete - * @return ApiDeletePetRequest - */ + DeletePet Deletes a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId Pet id to delete + @return ApiDeletePetRequest + */ DeletePet(ctx _context.Context, petId int64) ApiDeletePetRequest - /* - * DeletePetExecute executes the request - */ + // DeletePetExecute executes the request DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) /* - * FindPetsByStatus Finds Pets by status - * Multiple status values can be provided with comma separated strings - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByStatusRequest - */ + FindPetsByStatus Finds Pets by status + + Multiple status values can be provided with comma separated strings + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByStatusRequest + */ FindPetsByStatus(ctx _context.Context) ApiFindPetsByStatusRequest - /* - * FindPetsByStatusExecute executes the request - * @return []Pet - */ + // FindPetsByStatusExecute executes the request + // @return []Pet FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) /* - * FindPetsByTags Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByTagsRequest - */ + FindPetsByTags Finds Pets by tags + + Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByTagsRequest + + Deprecated + */ FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRequest - /* - * FindPetsByTagsExecute executes the request - * @return []Pet - */ + // FindPetsByTagsExecute executes the request + // @return []Pet + // Deprecated FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) /* - * GetPetById Find pet by ID - * Returns a single pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to return - * @return ApiGetPetByIdRequest - */ + GetPetById Find pet by ID + + Returns a single pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to return + @return ApiGetPetByIdRequest + */ GetPetById(ctx _context.Context, petId int64) ApiGetPetByIdRequest - /* - * GetPetByIdExecute executes the request - * @return Pet - */ + // GetPetByIdExecute executes the request + // @return Pet GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) /* - * UpdatePet Update an existing pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiUpdatePetRequest - */ + UpdatePet Update an existing pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiUpdatePetRequest + */ UpdatePet(ctx _context.Context) ApiUpdatePetRequest - /* - * UpdatePetExecute executes the request - */ + // UpdatePetExecute executes the request UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) /* - * UpdatePetWithForm Updates a pet in the store with form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet that needs to be updated - * @return ApiUpdatePetWithFormRequest - */ + UpdatePetWithForm Updates a pet in the store with form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet that needs to be updated + @return ApiUpdatePetWithFormRequest + */ UpdatePetWithForm(ctx _context.Context, petId int64) ApiUpdatePetWithFormRequest - /* - * UpdatePetWithFormExecute executes the request - */ + // UpdatePetWithFormExecute executes the request UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) /* - * UploadFile uploads an image - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileRequest - */ + UploadFile uploads an image + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileRequest + */ UploadFile(ctx _context.Context, petId int64) ApiUploadFileRequest - /* - * UploadFileExecute executes the request - * @return ApiResponse - */ + // UploadFileExecute executes the request + // @return ApiResponse UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) /* - * UploadFileWithRequiredFile uploads an image (required) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileWithRequiredFileRequest - */ + UploadFileWithRequiredFile uploads an image (required) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileWithRequiredFileRequest + */ UploadFileWithRequiredFile(ctx _context.Context, petId int64) ApiUploadFileWithRequiredFileRequest - /* - * UploadFileWithRequiredFileExecute executes the request - * @return ApiResponse - */ + // UploadFileWithRequiredFileExecute executes the request + // @return ApiResponse UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) } @@ -158,6 +155,7 @@ type ApiAddPetRequest struct { pet *Pet } +// Pet object that needs to be added to the store func (r ApiAddPetRequest) Pet(pet Pet) ApiAddPetRequest { r.pet = &pet return r @@ -168,10 +166,11 @@ func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) { } /* - * AddPet Add a new pet to the store - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiAddPetRequest - */ +AddPet Add a new pet to the store + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAddPetRequest +*/ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { return ApiAddPetRequest{ ApiService: a, @@ -179,9 +178,7 @@ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -269,11 +266,12 @@ func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) { } /* - * DeletePet Deletes a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId Pet id to delete - * @return ApiDeletePetRequest - */ +DeletePet Deletes a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId Pet id to delete + @return ApiDeletePetRequest +*/ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePetRequest { return ApiDeletePetRequest{ ApiService: a, @@ -282,9 +280,7 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePe } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -360,6 +356,8 @@ type ApiFindPetsByStatusRequest struct { status *[]string } +// Status values that need to be considered for filter +// Deprecated func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusRequest { r.status = &status return r @@ -370,11 +368,13 @@ func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) } /* - * FindPetsByStatus Finds Pets by status - * Multiple status values can be provided with comma separated strings - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByStatusRequest - */ +FindPetsByStatus Finds Pets by status + +Multiple status values can be provided with comma separated strings + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByStatusRequest +*/ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStatusRequest { return ApiFindPetsByStatusRequest{ ApiService: a, @@ -382,10 +382,8 @@ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStat } } -/* - * Execute executes the request - * @return []Pet - */ +// Execute executes the request +// @return []Pet func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -471,6 +469,7 @@ type ApiFindPetsByTagsRequest struct { tags *[]string } +// Tags to filter by func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest { r.tags = &tags return r @@ -481,11 +480,15 @@ func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) { } /* - * FindPetsByTags Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiFindPetsByTagsRequest - */ +FindPetsByTags Finds Pets by tags + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiFindPetsByTagsRequest + +Deprecated +*/ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRequest { return ApiFindPetsByTagsRequest{ ApiService: a, @@ -493,10 +496,9 @@ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRe } } -/* - * Execute executes the request - * @return []Pet - */ +// Execute executes the request +// @return []Pet +// Deprecated func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -588,12 +590,14 @@ func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) { } /* - * GetPetById Find pet by ID - * Returns a single pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to return - * @return ApiGetPetByIdRequest - */ +GetPetById Find pet by ID + +Returns a single pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to return + @return ApiGetPetByIdRequest +*/ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetByIdRequest { return ApiGetPetByIdRequest{ ApiService: a, @@ -602,10 +606,8 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetB } } -/* - * Execute executes the request - * @return Pet - */ +// Execute executes the request +// @return Pet func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -702,6 +704,7 @@ type ApiUpdatePetRequest struct { pet *Pet } +// Pet object that needs to be added to the store func (r ApiUpdatePetRequest) Pet(pet Pet) ApiUpdatePetRequest { r.pet = &pet return r @@ -712,10 +715,11 @@ func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdatePet Update an existing pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiUpdatePetRequest - */ +UpdatePet Update an existing pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiUpdatePetRequest +*/ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { return ApiUpdatePetRequest{ ApiService: a, @@ -723,9 +727,7 @@ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut @@ -804,10 +806,12 @@ type ApiUpdatePetWithFormRequest struct { status *string } +// Updated name of the pet func (r ApiUpdatePetWithFormRequest) Name(name string) ApiUpdatePetWithFormRequest { r.name = &name return r } +// Updated status of the pet func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormRequest { r.status = &status return r @@ -818,11 +822,12 @@ func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdatePetWithForm Updates a pet in the store with form data - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet that needs to be updated - * @return ApiUpdatePetWithFormRequest - */ +UpdatePetWithForm Updates a pet in the store with form data + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet that needs to be updated + @return ApiUpdatePetWithFormRequest +*/ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) ApiUpdatePetWithFormRequest { return ApiUpdatePetWithFormRequest{ ApiService: a, @@ -831,9 +836,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) Api } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -914,10 +917,12 @@ type ApiUploadFileRequest struct { file **os.File } +// Additional data to pass to server func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiUploadFileRequest { r.additionalMetadata = &additionalMetadata return r } +// file to upload func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest { r.file = &file return r @@ -928,11 +933,12 @@ func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) } /* - * UploadFile uploads an image - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileRequest - */ +UploadFile uploads an image + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileRequest +*/ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadFileRequest { return ApiUploadFileRequest{ ApiService: a, @@ -941,10 +947,8 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadF } } -/* - * Execute executes the request - * @return ApiResponse - */ +// Execute executes the request +// @return ApiResponse func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -1043,10 +1047,12 @@ type ApiUploadFileWithRequiredFileRequest struct { additionalMetadata *string } +// file to upload func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest { r.requiredFile = &requiredFile return r } +// Additional data to pass to server func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetadata string) ApiUploadFileWithRequiredFileRequest { r.additionalMetadata = &additionalMetadata return r @@ -1057,11 +1063,12 @@ func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp. } /* - * UploadFileWithRequiredFile uploads an image (required) - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param petId ID of pet to update - * @return ApiUploadFileWithRequiredFileRequest - */ +UploadFileWithRequiredFile uploads an image (required) + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param petId ID of pet to update + @return ApiUploadFileWithRequiredFileRequest +*/ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId int64) ApiUploadFileWithRequiredFileRequest { return ApiUploadFileWithRequiredFileRequest{ ApiService: a, @@ -1070,10 +1077,8 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i } } -/* - * Execute executes the request - * @return ApiResponse - */ +// Execute executes the request +// @return ApiResponse func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_store.go b/samples/openapi3/client/petstore/go/go-petstore/api_store.go index 3f85de0a9d6..1fb82f576fa 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_store.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_store.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -27,59 +27,58 @@ var ( type StoreApi interface { /* - * DeleteOrder Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of the order that needs to be deleted - * @return ApiDeleteOrderRequest - */ + DeleteOrder Delete purchase order by ID + + For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of the order that needs to be deleted + @return ApiDeleteOrderRequest + */ DeleteOrder(ctx _context.Context, orderId string) ApiDeleteOrderRequest - /* - * DeleteOrderExecute executes the request - */ + // DeleteOrderExecute executes the request DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) /* - * GetInventory Returns pet inventories by status - * Returns a map of status codes to quantities - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiGetInventoryRequest - */ + GetInventory Returns pet inventories by status + + Returns a map of status codes to quantities + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiGetInventoryRequest + */ GetInventory(ctx _context.Context) ApiGetInventoryRequest - /* - * GetInventoryExecute executes the request - * @return map[string]int32 - */ + // GetInventoryExecute executes the request + // @return map[string]int32 GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) /* - * GetOrderById Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of pet that needs to be fetched - * @return ApiGetOrderByIdRequest - */ + GetOrderById Find purchase order by ID + + For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of pet that needs to be fetched + @return ApiGetOrderByIdRequest + */ GetOrderById(ctx _context.Context, orderId int64) ApiGetOrderByIdRequest - /* - * GetOrderByIdExecute executes the request - * @return Order - */ + // GetOrderByIdExecute executes the request + // @return Order GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) /* - * PlaceOrder Place an order for a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiPlaceOrderRequest - */ + PlaceOrder Place an order for a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiPlaceOrderRequest + */ PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest - /* - * PlaceOrderExecute executes the request - * @return Order - */ + // PlaceOrderExecute executes the request + // @return Order PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) } @@ -98,12 +97,14 @@ func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) { } /* - * DeleteOrder Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of the order that needs to be deleted - * @return ApiDeleteOrderRequest - */ +DeleteOrder Delete purchase order by ID + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of the order that needs to be deleted + @return ApiDeleteOrderRequest +*/ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiDeleteOrderRequest { return ApiDeleteOrderRequest{ ApiService: a, @@ -112,9 +113,7 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiD } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -192,11 +191,13 @@ func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, } /* - * GetInventory Returns pet inventories by status - * Returns a map of status codes to quantities - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiGetInventoryRequest - */ +GetInventory Returns pet inventories by status + +Returns a map of status codes to quantities + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiGetInventoryRequest +*/ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequest { return ApiGetInventoryRequest{ ApiService: a, @@ -204,10 +205,8 @@ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequ } } -/* - * Execute executes the request - * @return map[string]int32 - */ +// Execute executes the request +// @return map[string]int32 func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -309,12 +308,14 @@ func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) { } /* - * GetOrderById Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param orderId ID of pet that needs to be fetched - * @return ApiGetOrderByIdRequest - */ +GetOrderById Find purchase order by ID + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param orderId ID of pet that needs to be fetched + @return ApiGetOrderByIdRequest +*/ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiGetOrderByIdRequest { return ApiGetOrderByIdRequest{ ApiService: a, @@ -323,10 +324,8 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiG } } -/* - * Execute executes the request - * @return Order - */ +// Execute executes the request +// @return Order func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -415,6 +414,7 @@ type ApiPlaceOrderRequest struct { order *Order } +// order placed for purchasing the pet func (r ApiPlaceOrderRequest) Order(order Order) ApiPlaceOrderRequest { r.order = &order return r @@ -425,10 +425,11 @@ func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) { } /* - * PlaceOrder Place an order for a pet - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiPlaceOrderRequest - */ +PlaceOrder Place an order for a pet + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiPlaceOrderRequest +*/ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest { return ApiPlaceOrderRequest{ ApiService: a, @@ -436,10 +437,8 @@ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest } } -/* - * Execute executes the request - * @return Order - */ +// Execute executes the request +// @return Order func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_user.go b/samples/openapi3/client/petstore/go/go-petstore/api_user.go index a844934ae98..0c259b33c4f 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_user.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_user.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -27,107 +27,102 @@ var ( type UserApi interface { /* - * CreateUser Create user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUserRequest - */ + CreateUser Create user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUserRequest + */ CreateUser(ctx _context.Context) ApiCreateUserRequest - /* - * CreateUserExecute executes the request - */ + // CreateUserExecute executes the request CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) /* - * CreateUsersWithArrayInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithArrayInputRequest - */ + CreateUsersWithArrayInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithArrayInputRequest + */ CreateUsersWithArrayInput(ctx _context.Context) ApiCreateUsersWithArrayInputRequest - /* - * CreateUsersWithArrayInputExecute executes the request - */ + // CreateUsersWithArrayInputExecute executes the request CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) /* - * CreateUsersWithListInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithListInputRequest - */ + CreateUsersWithListInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithListInputRequest + */ CreateUsersWithListInput(ctx _context.Context) ApiCreateUsersWithListInputRequest - /* - * CreateUsersWithListInputExecute executes the request - */ + // CreateUsersWithListInputExecute executes the request CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) /* - * DeleteUser Delete user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be deleted - * @return ApiDeleteUserRequest - */ + DeleteUser Delete user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be deleted + @return ApiDeleteUserRequest + */ DeleteUser(ctx _context.Context, username string) ApiDeleteUserRequest - /* - * DeleteUserExecute executes the request - */ + // DeleteUserExecute executes the request DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) /* - * GetUserByName Get user by user name - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be fetched. Use user1 for testing. - * @return ApiGetUserByNameRequest - */ + GetUserByName Get user by user name + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be fetched. Use user1 for testing. + @return ApiGetUserByNameRequest + */ GetUserByName(ctx _context.Context, username string) ApiGetUserByNameRequest - /* - * GetUserByNameExecute executes the request - * @return User - */ + // GetUserByNameExecute executes the request + // @return User GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) /* - * LoginUser Logs user into the system - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLoginUserRequest - */ + LoginUser Logs user into the system + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLoginUserRequest + */ LoginUser(ctx _context.Context) ApiLoginUserRequest - /* - * LoginUserExecute executes the request - * @return string - */ + // LoginUserExecute executes the request + // @return string LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) /* - * LogoutUser Logs out current logged in user session - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLogoutUserRequest - */ + LogoutUser Logs out current logged in user session + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLogoutUserRequest + */ LogoutUser(ctx _context.Context) ApiLogoutUserRequest - /* - * LogoutUserExecute executes the request - */ + // LogoutUserExecute executes the request LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) /* - * UpdateUser Updated user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username name that need to be deleted - * @return ApiUpdateUserRequest - */ + UpdateUser Updated user + + This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username name that need to be deleted + @return ApiUpdateUserRequest + */ UpdateUser(ctx _context.Context, username string) ApiUpdateUserRequest - /* - * UpdateUserExecute executes the request - */ + // UpdateUserExecute executes the request UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) } @@ -140,6 +135,7 @@ type ApiCreateUserRequest struct { user *User } +// Created user object func (r ApiCreateUserRequest) User(user User) ApiCreateUserRequest { r.user = &user return r @@ -150,11 +146,13 @@ func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, error) { } /* - * CreateUser Create user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUserRequest - */ +CreateUser Create user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUserRequest +*/ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { return ApiCreateUserRequest{ ApiService: a, @@ -162,9 +160,7 @@ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -241,6 +237,7 @@ type ApiCreateUsersWithArrayInputRequest struct { user *[]User } +// List of user object func (r ApiCreateUsersWithArrayInputRequest) User(user []User) ApiCreateUsersWithArrayInputRequest { r.user = &user return r @@ -251,10 +248,11 @@ func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, erro } /* - * CreateUsersWithArrayInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithArrayInputRequest - */ +CreateUsersWithArrayInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithArrayInputRequest +*/ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCreateUsersWithArrayInputRequest { return ApiCreateUsersWithArrayInputRequest{ ApiService: a, @@ -262,9 +260,7 @@ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCrea } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -341,6 +337,7 @@ type ApiCreateUsersWithListInputRequest struct { user *[]User } +// List of user object func (r ApiCreateUsersWithListInputRequest) User(user []User) ApiCreateUsersWithListInputRequest { r.user = &user return r @@ -351,10 +348,11 @@ func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, error } /* - * CreateUsersWithListInput Creates list of users with given input array - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiCreateUsersWithListInputRequest - */ +CreateUsersWithListInput Creates list of users with given input array + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiCreateUsersWithListInputRequest +*/ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreateUsersWithListInputRequest { return ApiCreateUsersWithListInputRequest{ ApiService: a, @@ -362,9 +360,7 @@ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreat } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost @@ -447,12 +443,14 @@ func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, error) { } /* - * DeleteUser Delete user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be deleted - * @return ApiDeleteUserRequest - */ +DeleteUser Delete user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be deleted + @return ApiDeleteUserRequest +*/ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDeleteUserRequest { return ApiDeleteUserRequest{ ApiService: a, @@ -461,9 +459,7 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDe } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete @@ -542,11 +538,12 @@ func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) { } /* - * GetUserByName Get user by user name - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username The name that needs to be fetched. Use user1 for testing. - * @return ApiGetUserByNameRequest - */ +GetUserByName Get user by user name + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username The name that needs to be fetched. Use user1 for testing. + @return ApiGetUserByNameRequest +*/ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) ApiGetUserByNameRequest { return ApiGetUserByNameRequest{ ApiService: a, @@ -555,10 +552,8 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) Ap } } -/* - * Execute executes the request - * @return User - */ +// Execute executes the request +// @return User func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -642,10 +637,12 @@ type ApiLoginUserRequest struct { password *string } +// The user name for login func (r ApiLoginUserRequest) Username(username string) ApiLoginUserRequest { r.username = &username return r } +// The password for login in clear text func (r ApiLoginUserRequest) Password(password string) ApiLoginUserRequest { r.password = &password return r @@ -656,10 +653,11 @@ func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, error) { } /* - * LoginUser Logs user into the system - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLoginUserRequest - */ +LoginUser Logs user into the system + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLoginUserRequest +*/ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { return ApiLoginUserRequest{ ApiService: a, @@ -667,10 +665,8 @@ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { } } -/* - * Execute executes the request - * @return string - */ +// Execute executes the request +// @return string func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -765,10 +761,11 @@ func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, error) { } /* - * LogoutUser Logs out current logged in user session - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @return ApiLogoutUserRequest - */ +LogoutUser Logs out current logged in user session + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiLogoutUserRequest +*/ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { return ApiLogoutUserRequest{ ApiService: a, @@ -776,9 +773,7 @@ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet @@ -851,6 +846,7 @@ type ApiUpdateUserRequest struct { user *User } +// Updated user object func (r ApiUpdateUserRequest) User(user User) ApiUpdateUserRequest { r.user = &user return r @@ -861,12 +857,14 @@ func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, error) { } /* - * UpdateUser Updated user - * This can only be done by the logged in user. - * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param username name that need to be deleted - * @return ApiUpdateUserRequest - */ +UpdateUser Updated user + +This can only be done by the logged in user. + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param username name that need to be deleted + @return ApiUpdateUserRequest +*/ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUpdateUserRequest { return ApiUpdateUserRequest{ ApiService: a, @@ -875,9 +873,7 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUp } } -/* - * Execute executes the request - */ +// Execute executes the request func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 4902cfae215..60262a81cab 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/configuration.go b/samples/openapi3/client/petstore/go/go-petstore/configuration.go index 77f753a1bf5..dc41bdcfc29 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/configuration.go +++ b/samples/openapi3/client/petstore/go/go-petstore/configuration.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_200_response.go b/samples/openapi3/client/petstore/go/go-petstore/model_200_response.go index b7b0355f5b1..27004b3b727 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_200_response.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_200_response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model__special_model_name_.go b/samples/openapi3/client/petstore/go/go-petstore/model__special_model_name_.go index f9eb00ea7b1..9b66df708cb 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model__special_model_name_.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model__special_model_name_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_additional_properties_class.go b/samples/openapi3/client/petstore/go/go-petstore/model_additional_properties_class.go index d9b88284fec..b7b55a2a983 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_additional_properties_class.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_additional_properties_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_animal.go b/samples/openapi3/client/petstore/go/go-petstore/model_animal.go index 0cbab5f9cca..1452a7259f1 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_animal.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_animal.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_api_response.go b/samples/openapi3/client/petstore/go/go-petstore/model_api_response.go index 65c951cc1da..6ad5fad605a 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_api_response.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_api_response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_apple.go b/samples/openapi3/client/petstore/go/go-petstore/model_apple.go index 848f5bb646d..443a333234a 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_apple.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_apple.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_apple_req.go b/samples/openapi3/client/petstore/go/go-petstore/model_apple_req.go index b4173ee93e5..5bed586e065 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_apple_req.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_apple_req.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go b/samples/openapi3/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go index cb234513d26..f4f77661d45 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_array_of_number_only.go b/samples/openapi3/client/petstore/go/go-petstore/model_array_of_number_only.go index cbfe71fc864..3f099edff2a 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_array_of_number_only.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_array_of_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_array_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_array_test_.go index fc81fe8070d..82ab2eaaf84 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_array_test_.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_array_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_banana.go b/samples/openapi3/client/petstore/go/go-petstore/model_banana.go index 99ef396994f..bfd1769a6ef 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_banana.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_banana.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_banana_req.go b/samples/openapi3/client/petstore/go/go-petstore/model_banana_req.go index 71af492ba3c..67e6d5542b9 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_banana_req.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_banana_req.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_capitalization.go b/samples/openapi3/client/petstore/go/go-petstore/model_capitalization.go index 3f6bb3db20b..88483e6c6c4 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_capitalization.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_capitalization.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_cat.go b/samples/openapi3/client/petstore/go/go-petstore/model_cat.go index 972484d4dbd..38604e23ea3 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_cat.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_cat.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_cat_all_of.go b/samples/openapi3/client/petstore/go/go-petstore/model_cat_all_of.go index 297bdc075ee..6e9092bd813 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_cat_all_of.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_cat_all_of.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_category.go b/samples/openapi3/client/petstore/go/go-petstore/model_category.go index 028a2e89663..f045ffa6566 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_category.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_category.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_class_model.go b/samples/openapi3/client/petstore/go/go-petstore/model_class_model.go index 598de1ee5b1..441570be10f 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_class_model.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_class_model.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_client.go b/samples/openapi3/client/petstore/go/go-petstore/model_client.go index bc96f5cd46a..08274685f07 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_client.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_dog.go b/samples/openapi3/client/petstore/go/go-petstore/model_dog.go index 0da4e82a263..7dba6c5b5ae 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_dog.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_dog.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_dog_all_of.go b/samples/openapi3/client/petstore/go/go-petstore/model_dog_all_of.go index b7ea128bd0a..8a6c06d1000 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_dog_all_of.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_dog_all_of.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go index 3675cc5f8f5..b602cc1122f 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_class.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_class.go index 9bbc1275cde..f2bafc2279b 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_enum_class.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go index e2e843b044e..b1f488fa0ba 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_file.go b/samples/openapi3/client/petstore/go/go-petstore/model_file.go index cc96065a9be..db093e41755 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_file.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_file.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_file_schema_test_class.go b/samples/openapi3/client/petstore/go/go-petstore/model_file_schema_test_class.go index 29cd6d4dabf..49c463209df 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_file_schema_test_class.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_file_schema_test_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_foo.go b/samples/openapi3/client/petstore/go/go-petstore/model_foo.go index 71a80199ed2..c4a466b4ac2 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_foo.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_foo.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go index af3e4bd852a..af2fe2e7b18 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_fruit.go b/samples/openapi3/client/petstore/go/go-petstore/model_fruit.go index eb733efbb06..555b8ab7484 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_fruit.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_fruit.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_fruit_req.go b/samples/openapi3/client/petstore/go/go-petstore/model_fruit_req.go index 1dd94b9be66..c3d6ea1cea6 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_fruit_req.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_fruit_req.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_gm_fruit.go b/samples/openapi3/client/petstore/go/go-petstore/model_gm_fruit.go index 9185243f6d0..bc1023eacaf 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_gm_fruit.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_gm_fruit.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_has_only_read_only.go b/samples/openapi3/client/petstore/go/go-petstore/model_has_only_read_only.go index 876b65e7986..08dad1f62cc 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_has_only_read_only.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_has_only_read_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_health_check_result.go b/samples/openapi3/client/petstore/go/go-petstore/model_health_check_result.go index 7d75cd6f70a..89403e096c1 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_health_check_result.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_health_check_result.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_inline_response_default.go b/samples/openapi3/client/petstore/go/go-petstore/model_inline_response_default.go index fda969bd19d..4b4cef54b8c 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_inline_response_default.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_inline_response_default.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_list.go b/samples/openapi3/client/petstore/go/go-petstore/model_list.go index 0cf382bab89..07e4bdd27a6 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_list.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_list.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_mammal.go b/samples/openapi3/client/petstore/go/go-petstore/model_mammal.go index 50f7d0bd167..a67af74d582 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_mammal.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_mammal.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go index 8f8b047c40e..36f315091b8 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/openapi3/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go index 9da2a721d8f..a3a55d01443 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_name.go b/samples/openapi3/client/petstore/go/go-petstore/model_name.go index b3a5c87ad87..0c4f820c6e5 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_name.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_name.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_nullable_class.go b/samples/openapi3/client/petstore/go/go-petstore/model_nullable_class.go index f80e869eca3..acb1a75ed61 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_nullable_class.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_nullable_class.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_number_only.go b/samples/openapi3/client/petstore/go/go-petstore/model_number_only.go index 772b4c941b7..bf811e6a573 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_number_only.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_number_only.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_order.go b/samples/openapi3/client/petstore/go/go-petstore/model_order.go index 0ad70df3665..bd72e6f6365 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_order.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_order.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_composite.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_composite.go index d11b292cb53..6fad0ae7dca 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_outer_composite.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_composite.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum.go index 8779e003e6b..937f4b63597 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_default_value.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_default_value.go index b0c116b7fe0..5324670d668 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_default_value.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_default_value.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer.go index 7f5e9dd4588..a3e43c01d69 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer_default_value.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer_default_value.go index 828b23454f5..80b8b0a46b2 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer_default_value.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_enum_integer_default_value.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_pet.go b/samples/openapi3/client/petstore/go/go-petstore/model_pet.go index 4e9edad7ec4..6a856bf7689 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_pet.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_pet.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. @@ -22,6 +22,7 @@ type Pet struct { PhotoUrls []string `json:"photoUrls"` Tags *[]Tag `json:"tags,omitempty"` // pet status in the store + // Deprecated Status *string `json:"status,omitempty"` AdditionalProperties map[string]interface{} } @@ -192,6 +193,7 @@ func (o *Pet) SetTags(v []Tag) { } // GetStatus returns the Status field value if set, zero value otherwise. +// Deprecated func (o *Pet) GetStatus() string { if o == nil || o.Status == nil { var ret string @@ -202,6 +204,7 @@ func (o *Pet) GetStatus() string { // GetStatusOk returns a tuple with the Status field value if set, nil otherwise // and a boolean to check if the value has been set. +// Deprecated func (o *Pet) GetStatusOk() (*string, bool) { if o == nil || o.Status == nil { return nil, false @@ -219,6 +222,7 @@ func (o *Pet) HasStatus() bool { } // SetStatus gets a reference to the given string and assigns it to the Status field. +// Deprecated func (o *Pet) SetStatus(v string) { o.Status = &v } diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_read_only_first.go b/samples/openapi3/client/petstore/go/go-petstore/model_read_only_first.go index b49f06adfcd..eed30450bc0 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_read_only_first.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_read_only_first.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_return.go b/samples/openapi3/client/petstore/go/go-petstore/model_return.go index 6898fc007b4..1752b15d24a 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_return.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_return.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_tag.go b/samples/openapi3/client/petstore/go/go-petstore/model_tag.go index 827c403d8a7..c7b20ccb32c 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_tag.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_tag.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_user.go b/samples/openapi3/client/petstore/go/go-petstore/model_user.go index 028b75528a5..85271ee249e 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_user.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_user.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_whale.go b/samples/openapi3/client/petstore/go/go-petstore/model_whale.go index bbf6a7cd025..914b8116296 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_whale.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_whale.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go b/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go index ab933760a44..eb23ffbedc9 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go +++ b/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/response.go b/samples/openapi3/client/petstore/go/go-petstore/response.go index d8189716b45..60c5d20ba46 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/response.go +++ b/samples/openapi3/client/petstore/go/go-petstore/response.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/signing.go b/samples/openapi3/client/petstore/go/go-petstore/signing.go index 9dc2cf7570a..55b954f5fd5 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/signing.go +++ b/samples/openapi3/client/petstore/go/go-petstore/signing.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/openapi3/client/petstore/go/go-petstore/utils.go b/samples/openapi3/client/petstore/go/go-petstore/utils.go index b35436c11f5..db7f0c4651d 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/utils.go +++ b/samples/openapi3/client/petstore/go/go-petstore/utils.go @@ -1,10 +1,10 @@ /* - * 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: \" \\ - * - * API version: 1.0.0 - */ +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: \" \\ + +API version: 1.0.0 +*/ // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. diff --git a/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Pet.kt b/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Pet.kt index f6ceae6bc63..c95e111c3d4 100644 --- a/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Pet.kt +++ b/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Pet.kt @@ -30,6 +30,7 @@ object Pets : BaseTable("Pet") { val name = text("name") val id = long("id") /* null */ val category = long("category") /* null */ + @Deprecated(message = "This property is deprecated.") val status = text("status").transform({ Pet.Status.valueOf(it ?: "available") }, { it.value }) /* null */ /* pet status in the store */ diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index 4be6ecab707..fa67d155511 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -102,6 +102,7 @@ "description" : "Multiple status values can be provided with comma separated strings", "operationId" : "findPetsByStatus", "parameters" : [ { + "deprecated" : true, "description" : "Status values that need to be considered for filter", "explode" : false, "in" : "query", @@ -1019,6 +1020,7 @@ } }, "status" : { + "deprecated" : true, "description" : "pet status in the store", "enum" : [ "available", "pending", "sold" ], "type" : "string" diff --git a/samples/server/petstore/erlang-server/priv/openapi.json b/samples/server/petstore/erlang-server/priv/openapi.json index 4be6ecab707..fa67d155511 100644 --- a/samples/server/petstore/erlang-server/priv/openapi.json +++ b/samples/server/petstore/erlang-server/priv/openapi.json @@ -102,6 +102,7 @@ "description" : "Multiple status values can be provided with comma separated strings", "operationId" : "findPetsByStatus", "parameters" : [ { + "deprecated" : true, "description" : "Status values that need to be considered for filter", "explode" : false, "in" : "query", @@ -1019,6 +1020,7 @@ } }, "status" : { + "deprecated" : true, "description" : "pet status in the store", "enum" : [ "available", "pending", "sold" ], "type" : "string" diff --git a/samples/server/petstore/go-api-server/api/openapi.yaml b/samples/server/petstore/go-api-server/api/openapi.yaml index 26aaeac34b7..606cc84f138 100644 --- a/samples/server/petstore/go-api-server/api/openapi.yaml +++ b/samples/server/petstore/go-api-server/api/openapi.yaml @@ -76,7 +76,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -759,6 +760,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/server/petstore/go-api-server/go/api.go b/samples/server/petstore/go-api-server/go/api.go index 64321a00b2e..5556474295e 100644 --- a/samples/server/petstore/go-api-server/go/api.go +++ b/samples/server/petstore/go-api-server/go/api.go @@ -24,6 +24,7 @@ type PetApiRouter interface { AddPet(http.ResponseWriter, *http.Request) DeletePet(http.ResponseWriter, *http.Request) FindPetsByStatus(http.ResponseWriter, *http.Request) + // Deprecated FindPetsByTags(http.ResponseWriter, *http.Request) GetPetById(http.ResponseWriter, *http.Request) UpdatePet(http.ResponseWriter, *http.Request) @@ -62,6 +63,7 @@ type PetApiServicer interface { AddPet(context.Context, Pet) (ImplResponse, error) DeletePet(context.Context, int64, string) (ImplResponse, error) FindPetsByStatus(context.Context, []string) (ImplResponse, error) + // Deprecated FindPetsByTags(context.Context, []string) (ImplResponse, error) GetPetById(context.Context, int64) (ImplResponse, error) UpdatePet(context.Context, Pet) (ImplResponse, error) diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go index fc0fb309883..863b9095b89 100644 --- a/samples/server/petstore/go-api-server/go/api_pet.go +++ b/samples/server/petstore/go-api-server/go/api_pet.go @@ -156,6 +156,7 @@ func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Reque } // FindPetsByTags - Finds Pets by tags +// Deprecated func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() tags := strings.Split(query.Get("tags"), ",") diff --git a/samples/server/petstore/go-api-server/go/api_pet_service.go b/samples/server/petstore/go-api-server/go/api_pet_service.go index d5f272f37a7..c612d222a87 100644 --- a/samples/server/petstore/go-api-server/go/api_pet_service.go +++ b/samples/server/petstore/go-api-server/go/api_pet_service.go @@ -67,6 +67,7 @@ func (s *PetApiService) FindPetsByStatus(ctx context.Context, status []string) ( } // FindPetsByTags - Finds Pets by tags +// Deprecated func (s *PetApiService) FindPetsByTags(ctx context.Context, tags []string) (ImplResponse, error) { // TODO - update FindPetsByTags with the required logic for this service method. // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. diff --git a/samples/server/petstore/go-api-server/go/model_pet.go b/samples/server/petstore/go-api-server/go/model_pet.go index fb206487ab0..3fb69fafe38 100644 --- a/samples/server/petstore/go-api-server/go/model_pet.go +++ b/samples/server/petstore/go-api-server/go/model_pet.go @@ -23,5 +23,6 @@ type Pet struct { Tags []Tag `json:"tags,omitempty"` // pet status in the store + // Deprecated Status string `json:"status,omitempty"` } diff --git a/samples/server/petstore/go-chi-server/api/openapi.yaml b/samples/server/petstore/go-chi-server/api/openapi.yaml index 26aaeac34b7..606cc84f138 100644 --- a/samples/server/petstore/go-chi-server/api/openapi.yaml +++ b/samples/server/petstore/go-chi-server/api/openapi.yaml @@ -76,7 +76,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -759,6 +760,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/server/petstore/go-chi-server/go/api.go b/samples/server/petstore/go-chi-server/go/api.go index 64321a00b2e..5556474295e 100644 --- a/samples/server/petstore/go-chi-server/go/api.go +++ b/samples/server/petstore/go-chi-server/go/api.go @@ -24,6 +24,7 @@ type PetApiRouter interface { AddPet(http.ResponseWriter, *http.Request) DeletePet(http.ResponseWriter, *http.Request) FindPetsByStatus(http.ResponseWriter, *http.Request) + // Deprecated FindPetsByTags(http.ResponseWriter, *http.Request) GetPetById(http.ResponseWriter, *http.Request) UpdatePet(http.ResponseWriter, *http.Request) @@ -62,6 +63,7 @@ type PetApiServicer interface { AddPet(context.Context, Pet) (ImplResponse, error) DeletePet(context.Context, int64, string) (ImplResponse, error) FindPetsByStatus(context.Context, []string) (ImplResponse, error) + // Deprecated FindPetsByTags(context.Context, []string) (ImplResponse, error) GetPetById(context.Context, int64) (ImplResponse, error) UpdatePet(context.Context, Pet) (ImplResponse, error) diff --git a/samples/server/petstore/go-chi-server/go/api_pet.go b/samples/server/petstore/go-chi-server/go/api_pet.go index 323215a42b8..b698977898f 100644 --- a/samples/server/petstore/go-chi-server/go/api_pet.go +++ b/samples/server/petstore/go-chi-server/go/api_pet.go @@ -155,6 +155,7 @@ func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Reque } // FindPetsByTags - Finds Pets by tags +// Deprecated func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() tags := strings.Split(query.Get("tags"), ",") diff --git a/samples/server/petstore/go-chi-server/go/api_pet_service.go b/samples/server/petstore/go-chi-server/go/api_pet_service.go index d5f272f37a7..c612d222a87 100644 --- a/samples/server/petstore/go-chi-server/go/api_pet_service.go +++ b/samples/server/petstore/go-chi-server/go/api_pet_service.go @@ -67,6 +67,7 @@ func (s *PetApiService) FindPetsByStatus(ctx context.Context, status []string) ( } // FindPetsByTags - Finds Pets by tags +// Deprecated func (s *PetApiService) FindPetsByTags(ctx context.Context, tags []string) (ImplResponse, error) { // TODO - update FindPetsByTags with the required logic for this service method. // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. diff --git a/samples/server/petstore/go-chi-server/go/model_pet.go b/samples/server/petstore/go-chi-server/go/model_pet.go index fb206487ab0..3fb69fafe38 100644 --- a/samples/server/petstore/go-chi-server/go/model_pet.go +++ b/samples/server/petstore/go-chi-server/go/model_pet.go @@ -23,5 +23,6 @@ type Pet struct { Tags []Tag `json:"tags,omitempty"` // pet status in the store + // Deprecated Status string `json:"status,omitempty"` } diff --git a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml index 26aaeac34b7..606cc84f138 100644 --- a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml +++ b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml @@ -76,7 +76,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -759,6 +760,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/server/petstore/go-echo-server/handlers/api_pet.go b/samples/server/petstore/go-echo-server/handlers/api_pet.go index 0fd09f1ff5c..7a538195159 100644 --- a/samples/server/petstore/go-echo-server/handlers/api_pet.go +++ b/samples/server/petstore/go-echo-server/handlers/api_pet.go @@ -30,6 +30,7 @@ func (c *Container) FindPetsByStatus(ctx echo.Context) error { // FindPetsByTags - Finds Pets by tags +// Deprecated func (c *Container) FindPetsByTags(ctx echo.Context) error { return ctx.JSON(http.StatusOK, models.HelloWorld { Message: "Hello World", diff --git a/samples/server/petstore/go-echo-server/main.go b/samples/server/petstore/go-echo-server/main.go index 2d4c212e23c..badc9f0fcb8 100644 --- a/samples/server/petstore/go-echo-server/main.go +++ b/samples/server/petstore/go-echo-server/main.go @@ -17,64 +17,64 @@ func main() { e.Use(middleware.Recover()) - // AddPet - Add a new pet to the store + // AddPet - Add a new pet to the store e.POST("/v2/pet", c.AddPet) - // DeletePet - Deletes a pet + // DeletePet - Deletes a pet e.DELETE("/v2/pet/:petId", c.DeletePet) - // FindPetsByStatus - Finds Pets by status + // FindPetsByStatus - Finds Pets by status e.GET("/v2/pet/findByStatus", c.FindPetsByStatus) - // FindPetsByTags - Finds Pets by tags + // FindPetsByTags - Finds Pets by tags (deprecated) e.GET("/v2/pet/findByTags", c.FindPetsByTags) - // GetPetById - Find pet by ID + // GetPetById - Find pet by ID e.GET("/v2/pet/:petId", c.GetPetById) - // UpdatePet - Update an existing pet + // UpdatePet - Update an existing pet e.PUT("/v2/pet", c.UpdatePet) - // UpdatePetWithForm - Updates a pet in the store with form data + // UpdatePetWithForm - Updates a pet in the store with form data e.POST("/v2/pet/:petId", c.UpdatePetWithForm) - // UploadFile - uploads an image + // UploadFile - uploads an image e.POST("/v2/pet/:petId/uploadImage", c.UploadFile) - // DeleteOrder - Delete purchase order by ID + // DeleteOrder - Delete purchase order by ID e.DELETE("/v2/store/order/:orderId", c.DeleteOrder) - // GetInventory - Returns pet inventories by status + // GetInventory - Returns pet inventories by status e.GET("/v2/store/inventory", c.GetInventory) - // GetOrderById - Find purchase order by ID + // GetOrderById - Find purchase order by ID e.GET("/v2/store/order/:orderId", c.GetOrderById) - // PlaceOrder - Place an order for a pet + // PlaceOrder - Place an order for a pet e.POST("/v2/store/order", c.PlaceOrder) - // CreateUser - Create user + // CreateUser - Create user e.POST("/v2/user", c.CreateUser) - // CreateUsersWithArrayInput - Creates list of users with given input array + // CreateUsersWithArrayInput - Creates list of users with given input array e.POST("/v2/user/createWithArray", c.CreateUsersWithArrayInput) - // CreateUsersWithListInput - Creates list of users with given input array + // CreateUsersWithListInput - Creates list of users with given input array e.POST("/v2/user/createWithList", c.CreateUsersWithListInput) - // DeleteUser - Delete user + // DeleteUser - Delete user e.DELETE("/v2/user/:username", c.DeleteUser) - // GetUserByName - Get user by user name + // GetUserByName - Get user by user name e.GET("/v2/user/:username", c.GetUserByName) - // LoginUser - Logs user into the system + // LoginUser - Logs user into the system e.GET("/v2/user/login", c.LoginUser) - // LogoutUser - Logs out current logged in user session + // LogoutUser - Logs out current logged in user session e.GET("/v2/user/logout", c.LogoutUser) - // UpdateUser - Updated user + // UpdateUser - Updated user e.PUT("/v2/user/:username", c.UpdateUser) diff --git a/samples/server/petstore/go-echo-server/models/model_pet.go b/samples/server/petstore/go-echo-server/models/model_pet.go index a315672b3bd..c6a3fff57a0 100644 --- a/samples/server/petstore/go-echo-server/models/model_pet.go +++ b/samples/server/petstore/go-echo-server/models/model_pet.go @@ -14,5 +14,6 @@ type Pet struct { Tags []Tag `json:"tags,omitempty"` // pet status in the store + // Deprecated Status string `json:"status,omitempty"` } diff --git a/samples/server/petstore/go-gin-api-server/api/openapi.yaml b/samples/server/petstore/go-gin-api-server/api/openapi.yaml index 26aaeac34b7..606cc84f138 100644 --- a/samples/server/petstore/go-gin-api-server/api/openapi.yaml +++ b/samples/server/petstore/go-gin-api-server/api/openapi.yaml @@ -76,7 +76,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -759,6 +760,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/server/petstore/go-gin-api-server/go/api_pet.go b/samples/server/petstore/go-gin-api-server/go/api_pet.go index 851a3ef5e88..3377d007de8 100644 --- a/samples/server/petstore/go-gin-api-server/go/api_pet.go +++ b/samples/server/petstore/go-gin-api-server/go/api_pet.go @@ -31,6 +31,7 @@ func FindPetsByStatus(c *gin.Context) { } // FindPetsByTags - Finds Pets by tags +// Deprecated func FindPetsByTags(c *gin.Context) { c.JSON(http.StatusOK, gin.H{}) } diff --git a/samples/server/petstore/go-gin-api-server/go/model_pet.go b/samples/server/petstore/go-gin-api-server/go/model_pet.go index fb206487ab0..3fb69fafe38 100644 --- a/samples/server/petstore/go-gin-api-server/go/model_pet.go +++ b/samples/server/petstore/go-gin-api-server/go/model_pet.go @@ -23,5 +23,6 @@ type Pet struct { Tags []Tag `json:"tags,omitempty"` // pet status in the store + // Deprecated Status string `json:"status,omitempty"` } diff --git a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml index 12848353afb..844d9cf368b 100644 --- a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml +++ b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml @@ -80,7 +80,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -788,6 +789,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index 22bbe695c0d..6f1084761b2 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -44,6 +44,7 @@ data class Pet( @field:JsonProperty("tags") val tags: kotlin.collections.List? = null, @ApiModelProperty(example = "null", value = "pet status in the store") + @Deprecated(message = "") @field:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/php-slim4/lib/Model/Pet.php b/samples/server/petstore/php-slim4/lib/Model/Pet.php index d657230c869..bd138318fe3 100644 --- a/samples/server/petstore/php-slim4/lib/Model/Pet.php +++ b/samples/server/petstore/php-slim4/lib/Model/Pet.php @@ -82,6 +82,7 @@ class Pet extends BaseModel "status" : { "type" : "string", "description" : "pet status in the store", + "deprecated" : true, "enum" : [ "available", "pending", "sold" ] } }, diff --git a/samples/server/petstore/python-fastapi/openapi.yaml b/samples/server/petstore/python-fastapi/openapi.yaml index 477694ade00..bd137dbc74f 100644 --- a/samples/server/petstore/python-fastapi/openapi.yaml +++ b/samples/server/petstore/python-fastapi/openapi.yaml @@ -76,7 +76,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status @@ -773,6 +774,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available From 4d0a40e982d3f12b28fa1b0c8b252273729b0365 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 4 Aug 2021 01:21:22 +0800 Subject: [PATCH 27/72] update samples --- .../main/java/org/openapitools/client/ApiClient.java | 10 ++++++++++ .../main/java/org/openapitools/client/ApiClient.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java index 970b3337373..8dd14bf1a27 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java @@ -123,6 +123,16 @@ public class ApiClient { return objectMapper; } + private RequestInterceptor buildOauthRequestInterceptor(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { + switch (flow) { + case password: + return new OauthPasswordGrant(tokenUrl, scopes); + case application: + return new OauthClientCredentialsGrant(authorizationUrl, tokenUrl, scopes); + default: + throw new RuntimeException("Oauth flow \"" + flow + "\" is not implemented"); + } + } public ObjectMapper getObjectMapper(){ return objectMapper; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java index 0ed3ad8901c..6dcf3fd1790 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java @@ -130,6 +130,16 @@ public class ApiClient { return objectMapper; } + private RequestInterceptor buildOauthRequestInterceptor(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { + switch (flow) { + case password: + return new OauthPasswordGrant(tokenUrl, scopes); + case application: + return new OauthClientCredentialsGrant(authorizationUrl, tokenUrl, scopes); + default: + throw new RuntimeException("Oauth flow \"" + flow + "\" is not implemented"); + } + } public ObjectMapper getObjectMapper(){ return objectMapper; From 98e4eb708ff5ea359595105ee06232f2df1673bf Mon Sep 17 00:00:00 2001 From: Gareth Smith Date: Wed, 4 Aug 2021 03:06:39 +0100 Subject: [PATCH 28/72] [BUG]Java] Fix a race condition in RetryingOAuth.mustache (#10087) If there were multiple concurrent requests at a time at which the OAuth token had expired, only a single request would be retried. The other requests would fail because of the expired token, but not be retried and so the failures would be propagated to the caller. --- .../okhttp-gson/auth/RetryingOAuth.mustache | 4 +- .../Java/libraries/okhttp-gson/pom.mustache | 6 + .../okhttp-gson-dynamicOperations/pom.xml | 6 + .../client/auth/RetryingOAuth.java | 4 +- .../java/okhttp-gson-parcelableModel/pom.xml | 6 + .../client/auth/RetryingOAuth.java | 4 +- .../okhttp-gson/.openapi-generator-ignore | 1 + .../client/petstore/java/okhttp-gson/pom.xml | 6 + .../client/auth/RetryingOAuth.java | 4 +- .../client/auth/RetryingOAuthTest.java | 112 ++++++++++++++++++ 10 files changed, 141 insertions(+), 12 deletions(-) create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache index 3ddacedb70e..6e6562448da 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache @@ -156,14 +156,12 @@ public class RetryingOAuth extends OAuth implements Interceptor { oAuthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { setAccessToken(accessTokenResponse.getAccessToken()); - return !getAccessToken().equals(requestAccessToken); } } catch (OAuthSystemException | OAuthProblemException e) { throw new IOException(e); } } - - return false; + return getAccessToken() == null || !getAccessToken().equals(requestAccessToken); } public TokenRequestBuilder getTokenRequestBuilder() { 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 38596f5369e..39f6f2b5c4b 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 @@ -332,6 +332,12 @@ ${junit-version} test + + org.mockito + mockito-core + 3.11.2 + test + {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml index 656360eff39..c4c2c923a10 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml @@ -279,6 +279,12 @@ ${junit-version} test + + org.mockito + mockito-core + 3.11.2 + test + 1.7 diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/RetryingOAuth.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/RetryingOAuth.java index 9cab81a7176..cb79b34ca87 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/RetryingOAuth.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/RetryingOAuth.java @@ -155,14 +155,12 @@ public class RetryingOAuth extends OAuth implements Interceptor { oAuthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { setAccessToken(accessTokenResponse.getAccessToken()); - return !getAccessToken().equals(requestAccessToken); } } catch (OAuthSystemException | OAuthProblemException e) { throw new IOException(e); } } - - return false; + return getAccessToken() == null || !getAccessToken().equals(requestAccessToken); } public TokenRequestBuilder getTokenRequestBuilder() { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 6761db7d59d..5b92eb11c69 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -281,6 +281,12 @@ ${junit-version} test + + org.mockito + mockito-core + 3.11.2 + test + 1.7 diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/RetryingOAuth.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/RetryingOAuth.java index 9cab81a7176..cb79b34ca87 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/RetryingOAuth.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/RetryingOAuth.java @@ -155,14 +155,12 @@ public class RetryingOAuth extends OAuth implements Interceptor { oAuthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { setAccessToken(accessTokenResponse.getAccessToken()); - return !getAccessToken().equals(requestAccessToken); } } catch (OAuthSystemException | OAuthProblemException e) { throw new IOException(e); } } - - return false; + return getAccessToken() == null || !getAccessToken().equals(requestAccessToken); } public TokenRequestBuilder getTokenRequestBuilder() { diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore b/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore index fa2ddf08fcc..6ba435b5655 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore @@ -5,6 +5,7 @@ src/test/java/org/openapitools/client/ApiClientTest.java src/test/java/org/openapitools/client/ConfigurationTest.java src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java +src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java src/test/java/org/openapitools/client/model/EnumValueTest.java src/test/java/org/openapitools/client/model/PetTest.java src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index 54685657f87..302f2cf0248 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -274,6 +274,12 @@ ${junit-version} test + + org.mockito + mockito-core + 3.11.2 + test + 1.7 diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/RetryingOAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/RetryingOAuth.java index 9cab81a7176..cb79b34ca87 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/RetryingOAuth.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/RetryingOAuth.java @@ -155,14 +155,12 @@ public class RetryingOAuth extends OAuth implements Interceptor { oAuthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { setAccessToken(accessTokenResponse.getAccessToken()); - return !getAccessToken().equals(requestAccessToken); } } catch (OAuthSystemException | OAuthProblemException e) { throw new IOException(e); } } - - return false; + return getAccessToken() == null || !getAccessToken().equals(requestAccessToken); } public TokenRequestBuilder getTokenRequestBuilder() { diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java new file mode 100644 index 00000000000..dca9b7c69ea --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java @@ -0,0 +1,112 @@ +package org.openapitools.client.auth; + +import okhttp3.Interceptor.Chain; +import okhttp3.*; +import okhttp3.Response.Builder; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.junit.Before; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.util.Collections; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class RetryingOAuthTest { + + private RetryingOAuth oauth; + + @Before + public void setUp() throws Exception { + oauth = new RetryingOAuth("_clientId", "_clientSecret", OAuthFlow.accessCode, + "https://token.example.com", Collections.emptyMap()); + oauth.setAccessToken("expired-access-token"); + FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true); + } + + @Test + public void testSingleRequestUnauthorized() throws Exception { + Response response = oauth.intercept(mockChain()); + assertEquals(HttpURLConnection.HTTP_OK, response.code()); + } + + @Test + public void testTwoConcurrentRequestsUnauthorized() throws Exception { + + Callable callable = new Callable() { + @Override + public Response call() throws Exception { + return oauth.intercept(mockChain()); + } + }; + ExecutorService executor = Executors.newFixedThreadPool(2); + try { + Future response1 = executor.submit(callable); + Future response2 = executor.submit(callable); + + assertEquals(HttpURLConnection.HTTP_OK, response1.get().code()); + assertEquals(HttpURLConnection.HTTP_OK, response2.get().code()); + } finally { + executor.shutdown(); + } + } + + private OAuthClient mockOAuthClient() throws OAuthProblemException, OAuthSystemException { + OAuthJSONAccessTokenResponse response = mock(OAuthJSONAccessTokenResponse.class); + when(response.getAccessToken()).thenAnswer(new Answer() { + @Override + public String answer(InvocationOnMock invocation) throws Throwable { + // sleep ensures that the bug is triggered. + Thread.sleep(1000); + return "new-access-token"; + } + }); + + OAuthClient client = mock(OAuthClient.class); + when(client.accessToken(any(OAuthClientRequest.class))).thenReturn(response); + return client; + } + + private Chain mockChain() throws IOException { + Chain chain = mock(Chain.class); + + final Request request = new Request.Builder() + .url("https://api.example.com") + .build(); + when(chain.request()).thenReturn(request); + + when(chain.proceed(any(Request.class))).thenAnswer(new Answer() { + @Override + public Response answer(InvocationOnMock inv) { + Request r = inv.getArgument(0); + int responseCode = "Bearer new-access-token".equals(r.header("Authorization")) + ? HttpURLConnection.HTTP_OK + : HttpURLConnection.HTTP_UNAUTHORIZED; + return new Builder() + .protocol(Protocol.HTTP_1_0) + .message("sup") + .request(request) + .body(ResponseBody.create(new byte[0], MediaType.get("application/test"))) + .code(responseCode) + .build(); + } + }); + + return chain; + } +} From ccd23ec75acd080e3b8d05b047d922a84a2696d4 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Wed, 4 Aug 2021 08:25:26 +0200 Subject: [PATCH 29/72] [dart-dio] Fix parameter generation problems (#10061) * fix parameter with list of `MultipartFile` being generated as single `MultipartFile` * generate serializer factories for all container params, not only body params * fix compilation errors when `skipFormModel=false` --- .../languages/DartDioNextClientCodegen.java | 35 +++++++++++++++---- .../built_value/serialize.mustache | 2 +- .../built_value/serializers.mustache | 4 ++- .../lib/src/serializers.dart | 12 +++++++ 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java index cf93047eda2..895a5559e68 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java @@ -20,6 +20,7 @@ import com.google.common.collect.Sets; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; +import org.openapitools.codegen.config.GlobalSettings; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.ClientModificationFeature; @@ -317,13 +318,23 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen { for (CodegenOperation op : operationList) { for (CodegenParameter param : op.allParams) { if (((op.isMultipart && param.isFormParam) || param.isBodyParam) && (param.isBinary || param.isFile)) { - param.baseType = "MultipartFile"; - param.dataType = "MultipartFile"; + param.dataType = param.dataType.replace("Uint8List", "MultipartFile"); + param.baseType = param.baseType.replace("Uint8List", "MultipartFile"); op.imports.add("MultipartFile"); + + if (SERIALIZATION_LIBRARY_BUILT_VALUE.equals(library)) { + boolean skipFormModel = Boolean.parseBoolean(GlobalSettings.getProperty(CodegenConstants.SKIP_FORM_MODEL, "true")); + if (param.isFormParam && param.isContainer && !skipFormModel) { + // Because of skipFormModel=false, there is a model class generated which has + // "BuiltList" as property and it requires the correct + // serializer imports to be added in order to compile. + addBuiltValueSerializerImport("Uint8List"); + } + } } } - // the MultipartFile handling above changes the type of some parameters from + // The MultipartFile handling above changes the type of some parameters from // `UInt8List`, the default for files, to `MultipartFile`. // // The following block removes the required import for Uint8List if it is no @@ -335,8 +346,10 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen { op.imports.remove("Uint8List"); } - for (CodegenParameter param : op.bodyParams) { - if (param.isContainer) { + for (CodegenParameter param : op.allParams) { + // Generate serializer factories for all container type parameters. + // But skip binary and file parameters, JSON serializers don't make sense there. + if (param.isContainer && !(param.isBinary || param.isFile )) { final Map serializer = new HashMap<>(); serializer.put("isArray", param.isArray); serializer.put("uniqueItems", param.uniqueItems); @@ -351,7 +364,9 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen { resultImports.add("package:" + pubName + "/src/api_util.dart"); } - if (op.returnContainer != null) { + // Generate serializer factories for response types. + // But skip binary and file response, JSON serializers don't make sense there. + if (op.returnContainer != null && !(op.isResponseBinary || op.isResponseFile)) { final Map serializer = new HashMap<>(); serializer.put("isArray", Objects.equals("array", op.returnContainer) || Objects.equals("set", op.returnContainer)); serializer.put("uniqueItems", op.uniqueItems); @@ -367,6 +382,14 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen { return objs; } + private void addBuiltValueSerializerImport(String type) { + additionalProperties.compute("builtValueSerializerImports", (k, v) -> { + Set imports = v == null ? Sets.newHashSet() : ((Set) v); + imports.addAll(rewriteImports(Sets.newHashSet(type), true)); + return imports; + }); + } + private Set rewriteImports(Set originalImports, boolean isModel) { Set resultImports = Sets.newHashSet(); for (String modelImport : originalImports) { diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache index 60dcd1773ba..d876fe2979b 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache @@ -2,7 +2,7 @@ {{#isMultipart}} _bodyData = FormData.fromMap({ {{#formParams}} - {{^required}}{{^isNullable}}if ({{{paramName}}} != null) {{/isNullable}}{{/required}}r'{{{baseName}}}': {{#isFile}}{{{paramName}}}{{/isFile}}{{^isFile}}encodeFormParameter(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{baseType}}}{{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]{{/isContainer}})){{/isFile}}, + {{^required}}{{^isNullable}}if ({{{paramName}}} != null) {{/isNullable}}{{/required}}r'{{{baseName}}}': {{#isFile}}{{{paramName}}}{{#isArray}}.toList(){{/isArray}}{{/isFile}}{{^isFile}}encodeFormParameter(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{baseType}}}{{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]{{/isContainer}})){{/isFile}}, {{/formParams}} }); {{/isMultipart}} diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serializers.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serializers.mustache index 10925bc1112..e1f3dbe1df5 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serializers.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serializers.mustache @@ -11,7 +11,9 @@ import 'package:{{pubName}}/src/model/date.dart';{{/useDateLibCore}} {{#useDateLibTimeMachine}}import 'package:time_machine/time_machine.dart'; import 'package:{{pubName}}/src/offset_date_serializer.dart';{{/useDateLibTimeMachine}} {{#models}}{{#model}}import 'package:{{pubName}}/src/model/{{classFilename}}.dart'; -{{/model}}{{/models}} +{{/model}}{{/models}}{{#builtValueSerializerImports}}import '{{{.}}}'; +{{/builtValueSerializerImports}} + part 'serializers.g.dart'; @SerializersFor([{{#models}}{{#model}} diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/serializers.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/serializers.dart index 52ea4eb7a19..1b807addf9e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/serializers.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/serializers.dart @@ -110,14 +110,26 @@ part 'serializers.g.dart'; User, ]) Serializers serializers = (_$serializers.toBuilder() + ..addBuilderFactory( + const FullType(BuiltList, [FullType(String)]), + () => ListBuilder(), + ) ..addBuilderFactory( const FullType(BuiltMap, [FullType(String), FullType(String)]), () => MapBuilder(), ) + ..addBuilderFactory( + const FullType(BuiltList, [FullType(String)]), + () => ListBuilder(), + ) ..addBuilderFactory( const FullType(BuiltSet, [FullType(Pet)]), () => SetBuilder(), ) + ..addBuilderFactory( + const FullType(BuiltSet, [FullType(String)]), + () => SetBuilder(), + ) ..addBuilderFactory( const FullType(BuiltList, [FullType(Pet)]), () => ListBuilder(), From 865510ea59bb5d032f55921955a8bf967a2c88d6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 4 Aug 2021 17:03:54 +0800 Subject: [PATCH 30/72] Update test build files to the latest SNAPSHOT version (#10090) * fix versions in test build files * test branch * Revert "test branch" This reverts commit 00ce0f029d4b524fcfc266ed787512e13cd85e5a. --- .../samples/local-spec/gradle.properties | 2 +- modules/openapi-generator-maven-plugin/examples/kotlin.xml | 2 +- modules/openapi-generator-maven-plugin/examples/spring.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 8b65b3b4572..abf7b9c5626 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties @@ -1,3 +1,3 @@ # RELEASE_VERSION -openApiGeneratorVersion=5.2.0-SNAPSHOT +openApiGeneratorVersion=5.2.1-SNAPSHOT # /RELEASE_VERSION diff --git a/modules/openapi-generator-maven-plugin/examples/kotlin.xml b/modules/openapi-generator-maven-plugin/examples/kotlin.xml index 32f2e262741..6db0f049f2a 100644 --- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml +++ b/modules/openapi-generator-maven-plugin/examples/kotlin.xml @@ -15,7 +15,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.0-SNAPSHOT + 5.2.1-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/spring.xml b/modules/openapi-generator-maven-plugin/examples/spring.xml index c0932d04dd0..79b8942ae57 100644 --- a/modules/openapi-generator-maven-plugin/examples/spring.xml +++ b/modules/openapi-generator-maven-plugin/examples/spring.xml @@ -20,7 +20,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.0-SNAPSHOT + 5.2.1-SNAPSHOT From dc23267580d43f18b8bf3458b425334240c10308 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Wed, 4 Aug 2021 19:28:45 +1000 Subject: [PATCH 31/72] [csharp] Obsolete attribute on deprecated operations and properties (#10084) --- .../aspnetcore/2.0/controller.mustache | 5 ++- .../aspnetcore/2.1/controller.mustache | 5 ++- .../aspnetcore/3.0/controller.mustache | 5 ++- .../resources/csharp-dotnet2/api.mustache | 10 ++++- .../resources/csharp-dotnet2/model.mustache | 3 ++ .../resources/csharp-nancyfx/api.mustache | 11 +++-- .../resources/csharp-netcore/api.mustache | 40 +++++++++++++++---- .../libraries/httpclient/api.mustache | 40 +++++++++++++++---- .../csharp-netcore/modelGeneric.mustache | 18 +++++++++ .../src/main/resources/csharp/api.mustache | 40 +++++++++++++++---- .../resources/csharp/modelGeneric.mustache | 6 +++ ...odels-for-testing-with-http-signature.yaml | 1 + ...ith-fake-endpoints-models-for-testing.yaml | 1 + .../Org/OpenAPITools/Api/PetApi.cs | 2 + .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../src/Org.OpenAPITools/Api/PetApi.cs | 24 +++++++---- .../Model/ObjectWithDeprecatedFields.cs | 3 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 4 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 4 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 8 ++++ .../src/Org.OpenAPITools/Api/PetApi.cs | 8 ++++ .../src/Org.OpenAPITools/Api/PetApi.cs | 8 ++++ .../petstore/java/feign/api/openapi.yaml | 3 +- .../petstore/java/webclient/api/openapi.yaml | 3 +- .../java/jersey2-java8/api/openapi.yaml | 3 +- .../Org.OpenAPITools/Controllers/PetApi.cs | 1 + .../Org.OpenAPITools/Controllers/PetApi.cs | 1 + .../Org.OpenAPITools/Controllers/PetApi.cs | 3 +- .../Org.OpenAPITools/Controllers/PetApi.cs | 1 + .../src/Org.OpenAPITools/Modules/PetModule.cs | 3 ++ .../src/Org.OpenAPITools/Modules/PetModule.cs | 3 ++ 44 files changed, 354 insertions(+), 100 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache index de15c470d1e..a1b1701985d 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache @@ -23,7 +23,7 @@ namespace {{packageName}}.Controllers /// {{#summary}}{{summary}}{{/summary}} /// {{#notes}} /// {{notes}}{{/notes}}{{#allParams}} - /// {{description}}{{/allParams}}{{#responses}} + /// {{description}}{{#isDeprecated}} (deprecated){{/isDeprecated}}{{/allParams}}{{#responses}} /// {{message}}{{/responses}} [{{httpMethod}}] [Route("{{{basePathWithoutHost}}}{{{path}}}")] @@ -33,6 +33,9 @@ namespace {{packageName}}.Controllers [ValidateModelState]{{#useSwashbuckle}} [SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}} [SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public virtual IActionResult {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#responses}} {{#dataType}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache index 4cc411514c5..c8203923b9d 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache @@ -31,7 +31,7 @@ namespace {{apiPackage}} /// {{#summary}}{{summary}}{{/summary}} /// {{#notes}} /// {{notes}}{{/notes}}{{#allParams}} - /// {{description}}{{/allParams}}{{#responses}} + /// {{description}}{{#isDeprecated}} (deprecated){{/isDeprecated}}{{/allParams}}{{#responses}} /// {{message}}{{/responses}} [{{httpMethod}}] [Route("{{{basePathWithoutHost}}}{{{path}}}")] @@ -50,6 +50,9 @@ namespace {{apiPackage}} [SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}} [SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}}{{^useSwashbuckle}}{{#responses}}{{#dataType}} [ProducesResponseType(statusCode: {{code}}, type: typeof({{&dataType}}))]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{operationModifier}} {{#operationResultTask}}{{#operationIsAsync}}async {{/operationIsAsync}}Task<{{/operationResultTask}}IActionResult{{#operationResultTask}}>{{/operationResultTask}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{^-last}}{{^isCookieParam}}, {{/isCookieParam}}{{/-last}}{{/allParams}}){{^generateBody}};{{/generateBody}} {{#generateBody}} { diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache index 9de20cebc10..9f6fcc803df 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache @@ -31,7 +31,7 @@ namespace {{apiPackage}} /// {{#summary}}{{summary}}{{/summary}} /// {{#notes}} /// {{notes}}{{/notes}}{{#allParams}} - /// {{description}}{{/allParams}}{{#responses}} + /// {{description}}{{#isDeprecated}} (deprecated){{/isDeprecated}}{{/allParams}}{{#responses}} /// {{message}}{{/responses}} [{{httpMethod}}] [Route("{{{basePathWithoutHost}}}{{{path}}}")] @@ -50,6 +50,9 @@ namespace {{apiPackage}} [SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}} [SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}}{{^useSwashbuckle}}{{#responses}}{{#dataType}} [ProducesResponseType(statusCode: {{code}}, type: typeof({{&dataType}}))]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{operationModifier}} {{#operationResultTask}}{{#operationIsAsync}}async {{/operationIsAsync}}Task<{{/operationResultTask}}IActionResult{{#operationResultTask}}>{{/operationResultTask}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{^-last}}{{^isCookieParam}}, {{/isCookieParam}}{{/-last}}{{/allParams}}){{^generateBody}};{{/generateBody}} {{#generateBody}} { diff --git a/modules/openapi-generator/src/main/resources/csharp-dotnet2/api.mustache b/modules/openapi-generator/src/main/resources/csharp-dotnet2/api.mustache index cfaf28d4cef..5990a0fbbd8 100644 --- a/modules/openapi-generator/src/main/resources/csharp-dotnet2/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-dotnet2/api.mustache @@ -17,8 +17,11 @@ namespace {{apiPackage}} /// /// {{summary}} {{notes}} /// - {{#allParams}}/// {{description}} + {{#allParams}}/// {{description}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); {{/operation}} } @@ -80,8 +83,11 @@ namespace {{apiPackage}} /// /// {{summary}} {{notes}} /// - {{#allParams}}/// {{description}} + {{#allParams}}/// {{description}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#allParams}}{{#required}} diff --git a/modules/openapi-generator/src/main/resources/csharp-dotnet2/model.mustache b/modules/openapi-generator/src/main/resources/csharp-dotnet2/model.mustache index 7c3311e1fd6..f9e13ed8f3c 100644 --- a/modules/openapi-generator/src/main/resources/csharp-dotnet2/model.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-dotnet2/model.mustache @@ -21,6 +21,9 @@ namespace {{modelPackage}} { /// {{{description}}}{{/description}} [DataMember(Name="{{baseName}}", EmitDefaultValue=false)] [JsonProperty(PropertyName = "{{baseName}}")] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{{dataType}}} {{name}} { get; set; } {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache index 02538ba251c..eb34a7fd50e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache @@ -45,8 +45,11 @@ namespace {{packageName}}.{{packageContext}}.Modules /// {{notes}} /// /// Context of request - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#asyncServer}}{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}}{{/asyncServer}}{{^asyncServer}}{{#returnType}}{{&returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}{{/asyncServer}} {{operationId}}(NancyContext context{{#allParams.0}}, {{/allParams.0}}{{>paramsList}});{{^-last}} {{/-last}}{{/operation}} @@ -57,14 +60,16 @@ namespace {{packageName}}.{{packageContext}}.Modules /// public abstract class Abstract{{classname}}Service: {{interfacePrefix}}{{classname}}Service { - {{#operation}}public virtual {{#asyncServer}}{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}}{{/asyncServer}}{{^asyncServer}}{{#returnType}}{{&returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}{{/asyncServer}} {{operationId}}(NancyContext context{{#allParams.0}}, {{/allParams.0}}{{>paramsList}}) + {{#operation}}{{#isDeprecated}}[Obsolete] + {{/isDeprecated}}public virtual {{#asyncServer}}{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}}{{/asyncServer}}{{^asyncServer}}{{#returnType}}{{&returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}{{/asyncServer}} {{operationId}}(NancyContext context{{#allParams.0}}, {{/allParams.0}}{{>paramsList}}) { {{^asyncServer}}{{#returnType}}return {{/returnType}}{{/asyncServer}}{{#asyncServer}}return {{/asyncServer}}{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); }{{^-last}} {{/-last}}{{/operation}} - {{#operation}}protected abstract {{#asyncServer}}{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}}{{/asyncServer}}{{^asyncServer}}{{#returnType}}{{&returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}{{/asyncServer}} {{operationId}}({{>paramsList}});{{^-last}} + {{#operation}}{{#isDeprecated}}[Obsolete] + {{/isDeprecated}}protected abstract {{#asyncServer}}{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}}{{/asyncServer}}{{^asyncServer}}{{#returnType}}{{&returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}{{/asyncServer}} {{operationId}}({{>paramsList}});{{^-last}} {{/-last}}{{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache index 8d84eecefb4..bb4894411bc 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache @@ -30,8 +30,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{/notes}} /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); /// @@ -41,8 +44,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); {{/operation}} #endregion Synchronous Operations @@ -64,10 +70,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -78,10 +87,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} System.Threading.Tasks.Task> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); {{/operation}} #endregion Asynchronous Operations @@ -220,8 +232,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#returnType}}{{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); @@ -232,8 +247,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{packageName}}.Client.ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#allParams}} @@ -429,10 +447,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { {{#returnType}}{{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); @@ -444,10 +465,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public async System.Threading.Tasks.Task<{{packageName}}.Client.ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { {{#allParams}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache index 20ddfe96b98..bf3e4377995 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache @@ -31,8 +31,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{/notes}} /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); /// @@ -42,8 +45,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); {{/operation}} #endregion Synchronous Operations @@ -65,10 +71,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -79,10 +88,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} System.Threading.Tasks.Task> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); {{/operation}} #endregion Asynchronous Operations @@ -318,8 +330,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#returnType}}{{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); @@ -330,8 +345,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{packageName}}.Client.ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#allParams}} @@ -527,10 +545,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { {{#returnType}}{{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); @@ -542,10 +563,13 @@ namespace {{packageName}}.{{apiPackage}} /// /// Thrown when fails to make API call {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public async System.Threading.Tasks.Task<{{packageName}}.Client.ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { {{#allParams}} 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 6eb1a2359d0..ad65a3b8361 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -33,6 +33,9 @@ {{/description}} {{^conditionalSerialization}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; } {{#isReadOnly}} @@ -49,6 +52,9 @@ {{#conditionalSerialization}} {{#isReadOnly}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; } @@ -64,6 +70,9 @@ {{^isReadOnly}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get{ return _{{name}};} @@ -184,6 +193,9 @@ {{#isDate}} [JsonConverter(typeof(OpenAPIDateConverter))] {{/isDate}} + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; } {{#isReadOnly}} @@ -203,6 +215,9 @@ {{#isDate}} [JsonConverter(typeof(OpenAPIDateConverter))] {{/isDate}} + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{{dataType}}} {{name}} { get; private set; } /// @@ -219,6 +234,9 @@ [JsonConverter(typeof(OpenAPIDateConverter))] {{/isDate}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{{dataType}}} {{name}} { get{ return _{{name}};} diff --git a/modules/openapi-generator/src/main/resources/csharp/api.mustache b/modules/openapi-generator/src/main/resources/csharp/api.mustache index 700d2bdb2be..8e80b857ad5 100644 --- a/modules/openapi-generator/src/main/resources/csharp/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/api.mustache @@ -31,8 +31,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); /// @@ -42,8 +45,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); {{/operation}} #endregion Synchronous Operations @@ -57,9 +63,12 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// Cancellation Token to cancel request (optional) /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}CancellationToken cancellationToken = default(CancellationToken)); /// @@ -69,9 +78,12 @@ namespace {{packageName}}.{{apiPackage}} /// {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// Cancellation Token to cancel request (optional) /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} System.Threading.Tasks.Task> {{operationId}}WithHttpInfoAsync ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}CancellationToken cancellationToken = default(CancellationToken)); {{/operation}} #endregion Asynchronous Operations @@ -191,8 +203,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// {{#returnType}}{{returnType}}{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#returnType}}ApiResponse<{{{returnType}}}> localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); @@ -203,8 +218,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) { {{#allParams}} @@ -335,9 +353,12 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// Cancellation Token to cancel request (optional) /// Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}CancellationToken cancellationToken = default(CancellationToken)) { {{#returnType}}ApiResponse<{{{returnType}}}> localVarResponse = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken); @@ -349,9 +370,12 @@ namespace {{packageName}}.{{apiPackage}} /// {{summary}} {{notes}} /// /// Thrown when fails to make API call - {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}}/// Cancellation Token to cancel request (optional) /// Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} public async System.Threading.Tasks.Task> {{operationId}}WithHttpInfoAsync ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}CancellationToken cancellationToken = default(CancellationToken)) { {{#allParams}} diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index b2077256ffb..933ba0824ae 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache @@ -32,6 +32,9 @@ /// {{description}} {{/description}} [DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#required}}true{{/required}}{{^required}}false{{/required}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})] + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; } {{/isEnum}} {{/vars}} @@ -110,6 +113,9 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; /// {{description}}{{/description}} [DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#required}}true{{/required}}{{^required}}false{{/required}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}} [JsonConverter(typeof(OpenAPIDateConverter))]{{/isDate}} + {{#deprecated}} + [Obsolete] + {{/deprecated}} public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; } {{/isEnum}} {{/isInherited}} diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index a2fbd151bfe..74c5926c22c 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -83,6 +83,7 @@ paths: required: true style: form explode: false + deprecated: true schema: type: array items: diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml index 7502a2db60b..b5b61096449 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -85,6 +85,7 @@ paths: required: true style: form explode: false + deprecated: true schema: type: array items: diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs index 48b1119b50a..7a6131e249e 100644 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs @@ -35,6 +35,7 @@ namespace Org.OpenAPITools.Api /// /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// /// Find pet by ID Returns a single pet @@ -237,6 +238,7 @@ namespace Org.OpenAPITools.Api /// /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs index 2bf19af1b1a..d73282dfca5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -275,7 +277,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -287,7 +289,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -301,6 +303,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -313,6 +316,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -863,7 +867,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -929,7 +933,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -942,7 +946,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1014,6 +1018,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1026,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1093,6 +1099,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1106,6 +1113,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 55881e301d5..d07754cd2e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -76,6 +76,7 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get{ return _Id;} @@ -100,6 +101,7 @@ namespace Org.OpenAPITools.Model /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get{ return _DeprecatedRef;} @@ -124,6 +126,7 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get{ return _Bars;} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs index f835c81b4d5..0aba26f2241 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs @@ -72,7 +72,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -83,7 +83,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -95,6 +95,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -106,6 +107,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -276,7 +278,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -288,7 +290,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -302,6 +304,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -314,6 +317,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -945,7 +949,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -957,7 +961,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -1023,7 +1027,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1036,7 +1040,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1108,6 +1112,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1120,6 +1125,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1187,6 +1193,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1200,6 +1207,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 8872961b5d6..57ba9112b15 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -59,18 +59,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get; set; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs index 2bf19af1b1a..d73282dfca5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -275,7 +277,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -287,7 +289,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -301,6 +303,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -313,6 +316,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -863,7 +867,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -929,7 +933,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -942,7 +946,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1014,6 +1018,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1026,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1093,6 +1099,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1106,6 +1113,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index a64ef652be3..25b5758c913 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -58,18 +58,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get; set; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs index 2bf19af1b1a..d73282dfca5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -275,7 +277,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -287,7 +289,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -301,6 +303,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -313,6 +316,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -863,7 +867,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -929,7 +933,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -942,7 +946,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1014,6 +1018,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1026,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1093,6 +1099,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1106,6 +1113,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index a64ef652be3..25b5758c913 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -58,18 +58,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get; set; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs index 2bf19af1b1a..d73282dfca5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -275,7 +277,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -287,7 +289,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -301,6 +303,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -313,6 +316,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -863,7 +867,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -929,7 +933,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -942,7 +946,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1014,6 +1018,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1026,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1093,6 +1099,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1106,6 +1113,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index a64ef652be3..25b5758c913 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -58,18 +58,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get; set; } /// 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 2bf19af1b1a..d73282dfca5 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 @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -275,7 +277,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -287,7 +289,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -301,6 +303,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -313,6 +316,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -863,7 +867,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -929,7 +933,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -942,7 +946,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -1014,6 +1018,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1026,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -1093,6 +1099,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -1106,6 +1113,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 3a3ce4c5801..33f85eacd47 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -57,18 +57,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] public List Bars { get; set; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs index 82f8266d4a1..6f8809911e9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus(List status); @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo(List status); /// @@ -94,6 +94,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(List tags); /// @@ -105,6 +106,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo(List tags); /// /// Find pet by ID @@ -253,7 +255,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -265,7 +267,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); @@ -279,6 +281,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// @@ -291,6 +294,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Find pet by ID @@ -776,7 +780,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus(List status) { @@ -788,7 +792,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) { @@ -838,7 +842,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -851,7 +855,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) @@ -907,6 +911,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags(List tags) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -919,6 +924,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) { // verify the required parameter 'tags' is set @@ -970,6 +976,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { Org.OpenAPITools.Client.ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); @@ -983,6 +990,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs index 6048e68c2b6..beb04e50af9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs @@ -65,6 +65,7 @@ namespace Org.OpenAPITools.Model /// /// pet status in the store [DataMember(Name = "status", EmitDefaultValue = false)] + [Obsolete] public StatusEnum? Status { get; set; } /// /// Initializes a new instance of the class. diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs index 4a0b50d0cbb..af3d41b729c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs @@ -76,7 +76,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> List FindPetsByStatus (List status); @@ -87,7 +87,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> ApiResponse> FindPetsByStatusWithHttpInfo (List status); /// @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -285,7 +287,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel request (optional) /// Task of List<Pet> System.Threading.Tasks.Task> FindPetsByStatusAsync (List status, CancellationToken cancellationToken = default(CancellationToken)); @@ -297,7 +299,7 @@ namespace Org.OpenAPITools.Api /// Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync (List status, CancellationToken cancellationToken = default(CancellationToken)); @@ -311,6 +313,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// @@ -323,6 +326,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// /// Find pet by ID @@ -876,7 +880,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// List<Pet> public List FindPetsByStatus (List status) { @@ -888,7 +892,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// ApiResponse of List<Pet> public ApiResponse> FindPetsByStatusWithHttpInfo (List status) { @@ -949,7 +953,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel request (optional) /// Task of List<Pet> public async System.Threading.Tasks.Task> FindPetsByStatusAsync (List status, CancellationToken cancellationToken = default(CancellationToken)) @@ -963,7 +967,7 @@ namespace Org.OpenAPITools.Api /// Finds Pets by status Multiple status values can be provided with comma separated strings /// /// Thrown when fails to make API call - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync (List status, CancellationToken cancellationToken = default(CancellationToken)) @@ -1027,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1039,6 +1044,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set @@ -1101,6 +1107,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken); @@ -1115,6 +1122,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index ec7b5c5193c..259253c2f72 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -55,18 +55,21 @@ namespace Org.OpenAPITools.Model /// Gets or Sets Id /// [DataMember(Name="id", EmitDefaultValue=false)] + [Obsolete] public decimal Id { get; set; } /// /// Gets or Sets DeprecatedRef /// [DataMember(Name="deprecatedRef", EmitDefaultValue=false)] + [Obsolete] public DeprecatedObject DeprecatedRef { get; set; } /// /// Gets or Sets Bars /// [DataMember(Name="bars", EmitDefaultValue=false)] + [Obsolete] public List Bars { get; set; } /// 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 ae5770045eb..186ed1237e4 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 @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -570,6 +572,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -582,6 +585,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set 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 4bd7fec789f..07a049f28c8 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 @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -570,6 +572,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -582,6 +585,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/PetApi.cs index 851379ebc9f..300293b4c41 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/PetApi.cs @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -311,6 +313,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// @@ -323,6 +326,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// /// Find pet by ID @@ -1027,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1039,6 +1044,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set @@ -1101,6 +1107,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken); @@ -1115,6 +1122,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { // verify the required parameter 'tags' is set 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 851379ebc9f..300293b4c41 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 @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -311,6 +313,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// @@ -323,6 +326,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// /// Find pet by ID @@ -1027,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1039,6 +1044,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set @@ -1101,6 +1107,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken); @@ -1115,6 +1122,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { // verify the required parameter 'tags' is set 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 0f65ea2d800..223e05ce52d 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 @@ -99,6 +99,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags (List tags); /// @@ -110,6 +111,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] ApiResponse> FindPetsByTagsWithHttpInfo (List tags); /// /// Find pet by ID @@ -311,6 +313,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// @@ -323,6 +326,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)); /// /// Find pet by ID @@ -1027,6 +1031,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// List<Pet> + [Obsolete] public List FindPetsByTags (List tags) { ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); @@ -1039,6 +1044,7 @@ namespace Org.OpenAPITools.Api /// Thrown when fails to make API call /// Tags to filter by /// ApiResponse of List<Pet> + [Obsolete] public ApiResponse> FindPetsByTagsWithHttpInfo (List tags) { // verify the required parameter 'tags' is set @@ -1101,6 +1107,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of List<Pet> + [Obsolete] public async System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { ApiResponse> localVarResponse = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken); @@ -1115,6 +1122,7 @@ namespace Org.OpenAPITools.Api /// Tags to filter by /// Cancellation Token to cancel request (optional) /// Task of ApiResponse (List<Pet>) + [Obsolete] public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync (List tags, CancellationToken cancellationToken = default(CancellationToken)) { // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index baf5bb3cde2..9c33abbfdad 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -100,7 +100,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml index baf5bb3cde2..9c33abbfdad 100644 --- a/samples/client/petstore/java/webclient/api/openapi.yaml +++ b/samples/client/petstore/java/webclient/api/openapi.yaml @@ -100,7 +100,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml index 235093bf19b..db6c6af8419 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -98,7 +98,8 @@ paths: description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter + - deprecated: true + description: Status values that need to be considered for filter explode: false in: query name: status diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs index d58ff968d3c..e23c800b82b 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -108,6 +108,7 @@ namespace Org.OpenAPITools.Controllers [ValidateModelState] [SwaggerOperation("FindPetsByTags")] [SwaggerResponse(statusCode: 200, type: typeof(List), description: "successful operation")] + [Obsolete] public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required()]List tags) { diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs index d58ff968d3c..e23c800b82b 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -108,6 +108,7 @@ namespace Org.OpenAPITools.Controllers [ValidateModelState] [SwaggerOperation("FindPetsByTags")] [SwaggerResponse(statusCode: 200, type: typeof(List), description: "successful operation")] + [Obsolete] public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required()]List tags) { diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs index 3162f82261b..68541eb890f 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -81,7 +81,7 @@ namespace Org.OpenAPITools.Controllers /// Finds Pets by status /// /// Multiple status values can be provided with comma separated strings - /// Status values that need to be considered for filter + /// Status values that need to be considered for filter (deprecated) /// successful operation /// Invalid status value [HttpGet] @@ -119,6 +119,7 @@ namespace Org.OpenAPITools.Controllers [ValidateModelState] [SwaggerOperation("FindPetsByTags")] [SwaggerResponse(statusCode: 200, type: typeof(List), description: "successful operation")] + [Obsolete] public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required()]List tags) { 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 68722c6b4cb..733404e0bdc 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -108,6 +108,7 @@ namespace Org.OpenAPITools.Controllers [ValidateModelState] [SwaggerOperation("FindPetsByTags")] [SwaggerResponse(statusCode: 200, type: typeof(List), description: "successful operation")] + [Obsolete] public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required()]List tags) { diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs index 28e385ce104..7ea7c760147 100644 --- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs +++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs @@ -143,6 +143,7 @@ namespace Org.OpenAPITools._v2.Modules /// Context of request /// Tags to filter by /// List<Pet> + [Obsolete] Task> FindPetsByTags(NancyContext context, List tags); /// @@ -202,6 +203,7 @@ namespace Org.OpenAPITools._v2.Modules return FindPetsByStatus(status); } + [Obsolete] public virtual Task> FindPetsByTags(NancyContext context, List tags) { return FindPetsByTags(tags); @@ -233,6 +235,7 @@ namespace Org.OpenAPITools._v2.Modules protected abstract Task> FindPetsByStatus(FindPetsByStatusStatusEnum? status); + [Obsolete] protected abstract Task> FindPetsByTags(List tags); protected abstract Task GetPetById(long? petId); diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs index 12233957857..8dc52f8275b 100644 --- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs +++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs @@ -142,6 +142,7 @@ namespace Org.OpenAPITools._v2.Modules /// Context of request /// Tags to filter by /// List<Pet> + [Obsolete] List FindPetsByTags(NancyContext context, List tags); /// @@ -201,6 +202,7 @@ namespace Org.OpenAPITools._v2.Modules return FindPetsByStatus(status); } + [Obsolete] public virtual List FindPetsByTags(NancyContext context, List tags) { return FindPetsByTags(tags); @@ -232,6 +234,7 @@ namespace Org.OpenAPITools._v2.Modules protected abstract List FindPetsByStatus(FindPetsByStatusStatusEnum? status); + [Obsolete] protected abstract List FindPetsByTags(List tags); protected abstract Pet GetPetById(long? petId); From ca5de9d503fc7c37b6a1c05f3d2e5ba657d0a873 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Wed, 4 Aug 2021 19:29:19 +1000 Subject: [PATCH 32/72] [php] Deprecated annotation on operations and fields (#10085) --- .../main/resources/php-laravel/api.mustache | 5 +++- .../main/resources/php-laravel/model.mustache | 3 +++ .../src/main/resources/php-lumen/api.mustache | 5 +++- .../main/resources/php-mezzio-ph/api.mustache | 3 +++ .../resources/php-slim-server/api.mustache | 3 +++ .../resources/php-slim-server/model.mustache | 3 +++ .../resources/php-slim4-server/api.mustache | 3 +++ .../main/resources/php-symfony/api.mustache | 6 +++-- .../php-symfony/api_controller.mustache | 3 +++ .../src/main/resources/php/api.mustache | 25 +++++++++++++++---- .../main/resources/php/model_generic.mustache | 6 +++++ .../php/OpenAPIClient-php/lib/Api/PetApi.php | 15 +++++++---- .../lib/Model/ObjectWithDeprecatedFields.php | 6 +++++ .../app/Http/Controllers/PetController.php | 1 + .../app/Models/ObjectWithDeprecatedFields.php | 3 +++ .../lib/app/Http/Controllers/PetApi.php | 1 + .../src/App/Handler/PetFindByTags.php | 1 + .../php-slim4/lib/Api/AbstractPetApi.php | 1 + .../SymfonyBundle-php/Api/PetApiInterface.php | 11 ++------ .../Api/StoreApiInterface.php | 4 --- .../Api/UserApiInterface.php | 8 ------ .../Controller/PetController.php | 1 + 22 files changed, 82 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-laravel/api.mustache b/modules/openapi-generator/src/main/resources/php-laravel/api.mustache index d0b17473a60..5e1af4b23d3 100644 --- a/modules/openapi-generator/src/main/resources/php-laravel/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-laravel/api.mustache @@ -21,9 +21,12 @@ use Illuminate\Support\Facades\Request; * * {{{summary}}}. * - {{#pathParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + {{#pathParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/pathParams}} * * @return Http response + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}({{#pathParams}}${{paramName}}{{^-last}}, {{/-last}}{{/pathParams}}) { diff --git a/modules/openapi-generator/src/main/resources/php-laravel/model.mustache b/modules/openapi-generator/src/main/resources/php-laravel/model.mustache index a250977567c..d44d0d45591 100644 --- a/modules/openapi-generator/src/main/resources/php-laravel/model.mustache +++ b/modules/openapi-generator/src/main/resources/php-laravel/model.mustache @@ -11,6 +11,9 @@ class {{classname}} { {{#vars}} /** @var {{{dataType}}} ${{name}} {{#description}}{{description}}{{/description}}*/ +{{#deprecated}} + /** @deprecated */ +{{/deprecated}} private ${{name}}; {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/php-lumen/api.mustache b/modules/openapi-generator/src/main/resources/php-lumen/api.mustache index d0b17473a60..5e1af4b23d3 100644 --- a/modules/openapi-generator/src/main/resources/php-lumen/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-lumen/api.mustache @@ -21,9 +21,12 @@ use Illuminate\Support\Facades\Request; * * {{{summary}}}. * - {{#pathParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + {{#pathParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/pathParams}} * * @return Http response + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}({{#pathParams}}${{paramName}}{{^-last}}, {{/-last}}{{/pathParams}}) { diff --git a/modules/openapi-generator/src/main/resources/php-mezzio-ph/api.mustache b/modules/openapi-generator/src/main/resources/php-mezzio-ph/api.mustache index ec0d1df137b..1b8f14b3c97 100644 --- a/modules/openapi-generator/src/main/resources/php-mezzio-ph/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-mezzio-ph/api.mustache @@ -57,6 +57,9 @@ class {{classname}} * * @return {{returnType}} {{/returnType}} +{{#isDeprecated}} + * @deprecated +{{/isDeprecated}} */ public function {{operationId}}(ServerRequestInterface $request){{#returnType}}: {{returnType}}{{/returnType}} { diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache index c53579e455c..5ba2d6bf58f 100644 --- a/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache @@ -84,6 +84,9 @@ abstract class {{classname}} * * @return ResponseInterface * @throws Exception to force implementation class to override this method + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}(ServerRequestInterface $request, ResponseInterface $response, array $args) { diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache index 9d2f570a7a9..afb360cb15b 100644 --- a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache @@ -27,6 +27,9 @@ class {{classname}} {{#vars}} /** @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}}*/ +{{#deprecated}} + /** @deprecated */ +{{/deprecated}} private ${{name}}; {{/vars}} } diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache index 27e826aa7de..4a2f87f0eec 100644 --- a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache @@ -60,6 +60,9 @@ abstract class {{classname}} * * @return ResponseInterface * @throws HttpNotImplementedException to force implementation class to override this method + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}(ServerRequestInterface $request, ResponseInterface $response, array $args) { diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache index 00c32b46804..db4c29278d8 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache @@ -57,13 +57,15 @@ interface {{classname}} * {{/description}} {{#allParams}} - * @param {{vendorExtensions.x-comment-type}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{vendorExtensions.x-comment-type}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * @param \int $responseCode The HTTP response code to return * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return {{{vendorExtensions.x-comment-type}}} - * + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}, {{/allParams}}&$responseCode, array &$responseHeaders); {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache index e7f813fe9ff..f966b27f757 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache @@ -54,6 +54,9 @@ class {{controllerName}} extends Controller {{/description}} * @param Request $request The Symfony request to handle. * @return Response The Symfony response. +{{#isDeprecated}} + * @deprecated +{{/isDeprecated}} */ public function {{operationId}}Action(Request $request{{#hasPathParams}}{{#pathParams}}, ${{paramName}}{{/pathParams}}{{/hasPathParams}}) { diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache index 45886299217..86fb93864ad 100644 --- a/modules/openapi-generator/src/main/resources/php/api.mustache +++ b/modules/openapi-generator/src/main/resources/php/api.mustache @@ -131,12 +131,15 @@ use {{invokerPackage}}\ObjectSerializer; {{/-last}} {{/servers}} {{#allParams}} - * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * * @throws \{{invokerPackage}}\ApiException on non-2xx response * @throws \InvalidArgumentException * @return {{#returnType}}{{#responses}}{{#dataType}}{{^-first}}|{{/-first}}{{/dataType}}{{{dataType}}}{{/responses}}{{/returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { @@ -169,12 +172,15 @@ use {{invokerPackage}}\ObjectSerializer; {{/-last}} {{/servers}} {{#allParams}} - * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * * @throws \{{invokerPackage}}\ApiException on non-2xx response * @throws \InvalidArgumentException * @return array of {{#returnType}}{{#responses}}{{#dataType}}{{^-first}}|{{/-first}}{{/dataType}}{{{dataType}}}{{/responses}}{{/returnType}}{{^returnType}}null{{/returnType}}, HTTP status code, HTTP response headers (array of strings) + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { @@ -294,11 +300,14 @@ use {{invokerPackage}}\ObjectSerializer; {{/-last}} {{/servers}} {{#allParams}} - * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}Async({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { @@ -335,11 +344,14 @@ use {{invokerPackage}}\ObjectSerializer; {{/-last}} {{/servers}} {{#allParams}} - * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}AsyncWithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { @@ -401,11 +413,14 @@ use {{invokerPackage}}\ObjectSerializer; {{/-last}} {{/servers}} {{#allParams}} - * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} + * @param {{{dataType}}} ${{paramName}}{{#description}} {{description}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} * * @throws \InvalidArgumentException * @return \GuzzleHttp\Psr7\Request + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ public function {{operationId}}Request({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { diff --git a/modules/openapi-generator/src/main/resources/php/model_generic.mustache b/modules/openapi-generator/src/main/resources/php/model_generic.mustache index 64bb657af16..35ccbed8275 100644 --- a/modules/openapi-generator/src/main/resources/php/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/php/model_generic.mustache @@ -279,6 +279,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par * Gets {{name}} * * @return {{{dataType}}}{{^required}}|null{{/required}} + {{#deprecated}} + * @deprecated + {{/deprecated}} */ public function {{getter}}() { @@ -291,6 +294,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par * @param {{{dataType}}}{{^required}}|null{{/required}} ${{name}}{{#description}} {{{description}}}{{/description}}{{^description}} {{{name}}}{{/description}} * * @return self + {{#deprecated}} + * @deprecated + {{/deprecated}} */ public function {{setter}}(${{name}}) { 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 2f035ffc4f0..d7c0658ce9e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -598,7 +598,7 @@ class PetApi * * Finds Pets by status * - * @param string[] $status Status values that need to be considered for filter (required) + * @param string[] $status Status values that need to be considered for filter (required) (deprecated) * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException @@ -615,7 +615,7 @@ class PetApi * * Finds Pets by status * - * @param string[] $status Status values that need to be considered for filter (required) + * @param string[] $status Status values that need to be considered for filter (required) (deprecated) * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException @@ -701,7 +701,7 @@ class PetApi * * Finds Pets by status * - * @param string[] $status Status values that need to be considered for filter (required) + * @param string[] $status Status values that need to be considered for filter (required) (deprecated) * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface @@ -721,7 +721,7 @@ class PetApi * * Finds Pets by status * - * @param string[] $status Status values that need to be considered for filter (required) + * @param string[] $status Status values that need to be considered for filter (required) (deprecated) * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface @@ -767,7 +767,7 @@ class PetApi /** * Create request for operation 'findPetsByStatus' * - * @param string[] $status Status values that need to be considered for filter (required) + * @param string[] $status Status values that need to be considered for filter (required) (deprecated) * * @throws \InvalidArgumentException * @return \GuzzleHttp\Psr7\Request @@ -870,6 +870,7 @@ class PetApi * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return \OpenAPI\Client\Model\Pet[] + * @deprecated */ public function findPetsByTags($tags) { @@ -887,6 +888,7 @@ class PetApi * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return array of \OpenAPI\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings) + * @deprecated */ public function findPetsByTagsWithHttpInfo($tags) { @@ -972,6 +974,7 @@ class PetApi * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface + * @deprecated */ public function findPetsByTagsAsync($tags) { @@ -992,6 +995,7 @@ class PetApi * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface + * @deprecated */ public function findPetsByTagsAsyncWithHttpInfo($tags) { @@ -1038,6 +1042,7 @@ class PetApi * * @throws \InvalidArgumentException * @return \GuzzleHttp\Psr7\Request + * @deprecated */ public function findPetsByTagsRequest($tags) { diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php index 2129a3c4e5f..9c4bec33b2c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php @@ -251,6 +251,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * Gets id * * @return float|null + * @deprecated */ public function getId() { @@ -263,6 +264,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * @param float|null $id id * * @return self + * @deprecated */ public function setId($id) { @@ -275,6 +277,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * Gets deprecated_ref * * @return \OpenAPI\Client\Model\DeprecatedObject|null + * @deprecated */ public function getDeprecatedRef() { @@ -287,6 +290,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * @param \OpenAPI\Client\Model\DeprecatedObject|null $deprecated_ref deprecated_ref * * @return self + * @deprecated */ public function setDeprecatedRef($deprecated_ref) { @@ -299,6 +303,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * Gets bars * * @return string[]|null + * @deprecated */ public function getBars() { @@ -311,6 +316,7 @@ class ObjectWithDeprecatedFields implements ModelInterface, ArrayAccess, \JsonSe * @param string[]|null $bars bars * * @return self + * @deprecated */ public function setBars($bars) { diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php index 085cd13ae4e..125c7ef58b3 100644 --- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php +++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php @@ -130,6 +130,7 @@ class PetController extends Controller * * * @return Http response + * @deprecated */ public function findPetsByTags() { diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ObjectWithDeprecatedFields.php b/samples/server/petstore/php-laravel/lib/app/Models/ObjectWithDeprecatedFields.php index f846c564e8e..47b30e1579a 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ObjectWithDeprecatedFields.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ObjectWithDeprecatedFields.php @@ -13,12 +13,15 @@ class ObjectWithDeprecatedFields { private $uuid; /** @var float $id */ + /** @deprecated */ private $id; /** @var \app\Models\DeprecatedObject $deprecatedRef */ + /** @deprecated */ private $deprecatedRef; /** @var string[] $bars */ + /** @deprecated */ private $bars; } diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/PetApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/PetApi.php index 16b44e90eac..3b7944400c7 100644 --- a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/PetApi.php +++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/PetApi.php @@ -126,6 +126,7 @@ class PetApi extends Controller * * * @return Http response + * @deprecated */ public function findPetsByTags() { diff --git a/samples/server/petstore/php-mezzio-ph/src/App/Handler/PetFindByTags.php b/samples/server/petstore/php-mezzio-ph/src/App/Handler/PetFindByTags.php index b74484da909..e09693cf4aa 100644 --- a/samples/server/petstore/php-mezzio-ph/src/App/Handler/PetFindByTags.php +++ b/samples/server/petstore/php-mezzio-ph/src/App/Handler/PetFindByTags.php @@ -32,6 +32,7 @@ class PetFindByTags * @throws PHException\HttpCode 501 if the method is not implemented * * @return \App\DTO\Collection26 + * @deprecated */ public function findPetsByTags(ServerRequestInterface $request): \App\DTO\Collection26 { diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php index cffea37cd76..a73ba0da845 100644 --- a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php +++ b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php @@ -125,6 +125,7 @@ abstract class AbstractPetApi * * @return ResponseInterface * @throws HttpNotImplementedException to force implementation class to override this method + * @deprecated */ public function findPetsByTags(ServerRequestInterface $request, ResponseInterface $response, array $args) { diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index 516447dd143..f324381b815 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -80,7 +80,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Pet - * */ public function addPet(Pet $pet, &$responseCode, array &$responseHeaders); @@ -95,7 +94,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function deletePet($petId, $apiKey = null, &$responseCode, array &$responseHeaders); @@ -104,12 +102,11 @@ interface PetApiInterface * * Finds Pets by status * - * @param \string[] $status Status values that need to be considered for filter (required) + * @param \string[] $status Status values that need to be considered for filter (required) (deprecated) * @param \int $responseCode The HTTP response code to return * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Pet[] - * */ public function findPetsByStatus(array $status, &$responseCode, array &$responseHeaders); @@ -123,7 +120,7 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Pet[] - * + * @deprecated */ public function findPetsByTags(array $tags, &$responseCode, array &$responseHeaders); @@ -137,7 +134,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Pet - * */ public function getPetById($petId, &$responseCode, array &$responseHeaders); @@ -151,7 +147,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Pet - * */ public function updatePet(Pet $pet, &$responseCode, array &$responseHeaders); @@ -167,7 +162,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function updatePetWithForm($petId, $name = null, $status = null, &$responseCode, array &$responseHeaders); @@ -183,7 +177,6 @@ interface PetApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\ApiResponse - * */ public function uploadFile($petId, $additionalMetadata = null, UploadedFile $file = null, &$responseCode, array &$responseHeaders); } diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php index cebfa0aecf5..d70e7bb92ac 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php @@ -61,7 +61,6 @@ interface StoreApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function deleteOrder($orderId, &$responseCode, array &$responseHeaders); @@ -74,7 +73,6 @@ interface StoreApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \int - * */ public function getInventory(&$responseCode, array &$responseHeaders); @@ -88,7 +86,6 @@ interface StoreApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Order - * */ public function getOrderById($orderId, &$responseCode, array &$responseHeaders); @@ -102,7 +99,6 @@ interface StoreApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\Order - * */ public function placeOrder(Order $order, &$responseCode, array &$responseHeaders); } diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php index 961b6570e8f..9b8489e78fe 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php @@ -61,7 +61,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function createUser(User $user, &$responseCode, array &$responseHeaders); @@ -75,7 +74,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function createUsersWithArrayInput(array $user, &$responseCode, array &$responseHeaders); @@ -89,7 +87,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function createUsersWithListInput(array $user, &$responseCode, array &$responseHeaders); @@ -103,7 +100,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function deleteUser($username, &$responseCode, array &$responseHeaders); @@ -117,7 +113,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \OpenAPI\Server\Model\User - * */ public function getUserByName($username, &$responseCode, array &$responseHeaders); @@ -132,7 +127,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return \string - * */ public function loginUser($username, $password, &$responseCode, array &$responseHeaders); @@ -145,7 +139,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function logoutUser(&$responseCode, array &$responseHeaders); @@ -160,7 +153,6 @@ interface UserApiInterface * @param \array $responseHeaders Additional HTTP headers to return with the response () * * @return void - * */ public function updateUser($username, User $user, &$responseCode, array &$responseHeaders); } diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php index a20c8b98a2b..9ca6496280f 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php @@ -324,6 +324,7 @@ class PetController extends Controller * * @param Request $request The Symfony request to handle. * @return Response The Symfony response. + * @deprecated */ public function findPetsByTagsAction(Request $request) { From 75181210d56fe88c7088456fa3abbc1773a62a57 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Thu, 5 Aug 2021 12:16:59 +0200 Subject: [PATCH 33/72] Add tests for enum query encoding (#10054) --- .../test/api_util_test.dart | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/test/api_util_test.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/test/api_util_test.dart index b636c5b8ca6..4b0bf354cca 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/test/api_util_test.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/test/api_util_test.dart @@ -7,6 +7,125 @@ import 'package:test/test.dart'; void main() { group('api_utils', () { + group('encodeQueryParameter should encode', () { + group('String enum', () { + test('empty String for null', () { + expect( + encodeQueryParameter( + standardSerializers, + null, + const FullType(ModelEnumClass), + ), + '', + ); + }); + + test('correct String for value', () { + expect( + encodeQueryParameter( + standardSerializers, + ModelEnumClass.leftParenthesisXyzRightParenthesis, + const FullType(ModelEnumClass), + ), + '(xyz)', + ); + }); + }); + + group('int enum', () { + test('empty String for null', () { + expect( + encodeQueryParameter( + standardSerializers, + null, + const FullType(EnumTestEnumIntegerEnum), + ), + '', + ); + }); + + test('correct int for value', () { + expect( + encodeQueryParameter( + standardSerializers, + EnumTestEnumIntegerEnum.numberNegative1, + const FullType(EnumTestEnumIntegerEnum), + ), + -1, + ); + }); + }); + }); + + group('encodeCollectionQueryParameter should encode', () { + final serializers = (standardSerializers.toBuilder() + ..addBuilderFactory( + const FullType(BuiltList, [FullType(ModelEnumClass)]), + () => ListBuilder(), + ) + ..addBuilderFactory( + const FullType(BuiltList, [FullType(EnumTestEnumIntegerEnum)]), + () => ListBuilder(), + )) + .build(); + + group('String enum', () { + test('empty ListParam for empty list', () { + final param = encodeCollectionQueryParameter( + serializers, + [].build(), + const FullType(BuiltList, [FullType(ModelEnumClass)]), + ); + + expect(param.value, isEmpty); + expect(param.format, ListFormat.multi); + }); + + test('correct ListParam for value', () { + final param = encodeCollectionQueryParameter( + serializers, + [ + ModelEnumClass.leftParenthesisXyzRightParenthesis, + ModelEnumClass.efg, + ].build(), + const FullType(BuiltList, [FullType(ModelEnumClass)]), + ); + + expect(param.value, hasLength(2)); + expect(param.value, containsAll(['-efg', '(xyz)'])); + expect(param.format, ListFormat.multi); + }); + }); + + group('int enum', () { + test('empty ListParam for empty list', () { + final param = encodeCollectionQueryParameter( + serializers, + [].build(), + const FullType(BuiltList, [FullType(EnumTestEnumIntegerEnum)]), + ); + + expect(param.value, isEmpty); + expect(param.format, ListFormat.multi); + }); + + test('correct ListParam for value', () { + final param = encodeCollectionQueryParameter( + serializers, + [ + EnumTestEnumIntegerEnum.number1, + EnumTestEnumIntegerEnum.numberNegative1, + ].build(), + const FullType(BuiltList, [FullType(EnumTestEnumIntegerEnum)]), + ); + + expect(param.value, hasLength(2)); + expect(param.value, containsAll([1, -1])); + expect(param.format, ListFormat.multi); + }); + }); + }); + group('encodeFormParameter should return', () { test('empty String for null', () { expect( From c05ec99182c80993a218a841853ba6412e6a6c16 Mon Sep 17 00:00:00 2001 From: duxiaofeng Date: Fri, 6 Aug 2021 14:59:40 +0800 Subject: [PATCH 34/72] make typescript-fetch code compatiable with nodejs environment (#10072) --- .../src/main/resources/typescript-fetch/runtime.mustache | 4 ++-- .../petstore/typescript-fetch/builds/default-v3.0/runtime.ts | 4 ++-- .../petstore/typescript-fetch/builds/default/runtime.ts | 4 ++-- .../client/petstore/typescript-fetch/builds/enum/runtime.ts | 4 ++-- .../typescript-fetch/builds/es6-target/src/runtime.ts | 4 ++-- .../typescript-fetch/builds/multiple-parameters/runtime.ts | 4 ++-- .../builds/prefix-parameter-interfaces/src/runtime.ts | 4 ++-- .../typescript-fetch/builds/sagas-and-records/src/runtime.ts | 4 ++-- .../builds/typescript-three-plus/src/runtime.ts | 4 ++-- .../typescript-fetch/builds/with-interfaces/runtime.ts | 4 ++-- .../typescript-fetch/builds/with-npm-version/src/runtime.ts | 4 ++-- .../builds/without-runtime-checks/src/runtime.ts | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) 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 8df16e9074e..3532836aba0 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -74,7 +74,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -137,7 +137,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts index 6924269e546..4954bd81789 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts index c4d82bccb8f..fceb79bf4c4 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts index 40ac35e9d19..ccfe56260d8 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts index 40ac35e9d19..ccfe56260d8 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { 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 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts index 8ae5f65348c..164ebaaaea8 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts @@ -85,7 +85,7 @@ export class BaseAPI { }) || fetchParams; } } - let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init); + let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); for (const middleware of this.middleware) { if (middleware.post) { response = await middleware.post({ @@ -148,7 +148,7 @@ export class Configuration { } get fetchApi(): FetchAPI { - return this.configuration.fetchApi || window.fetch.bind(window); + return this.configuration.fetchApi; } get middleware(): Middleware[] { From c4b98041391a0a94e1d668addac0e6de6bf2a25b Mon Sep 17 00:00:00 2001 From: Richard Willis Date: Fri, 6 Aug 2021 08:14:52 +0100 Subject: [PATCH 35/72] [typescript-fetch] Add initOverrides (#10050) You can now pass in fetch initOverrides per request. This change is mainly to add support for request cancellation (via AbortSignal). --- .../resources/typescript-fetch/apis.mustache | 22 +-- .../typescript-fetch/runtime.mustache | 9 +- .../default-v3.0/apis/AnotherFakeApi.ts | 8 +- .../builds/default-v3.0/apis/DefaultApi.ts | 8 +- .../builds/default-v3.0/apis/FakeApi.ts | 136 +++++++++--------- .../apis/FakeClassnameTags123Api.ts | 8 +- .../builds/default-v3.0/apis/PetApi.ts | 72 +++++----- .../builds/default-v3.0/apis/StoreApi.ts | 32 ++--- .../builds/default-v3.0/apis/UserApi.ts | 64 ++++----- .../builds/default-v3.0/runtime.ts | 9 +- .../builds/default/apis/PetApi.ts | 64 ++++----- .../builds/default/apis/StoreApi.ts | 32 ++--- .../builds/default/apis/UserApi.ts | 64 ++++----- .../builds/default/runtime.ts | 9 +- .../builds/enum/apis/DefaultApi.ts | 32 ++--- .../typescript-fetch/builds/enum/runtime.ts | 9 +- .../builds/es6-target/src/apis/PetApi.ts | 64 ++++----- .../builds/es6-target/src/apis/StoreApi.ts | 32 ++--- .../builds/es6-target/src/apis/UserApi.ts | 64 ++++----- .../builds/es6-target/src/runtime.ts | 9 +- .../builds/multiple-parameters/apis/PetApi.ts | 64 ++++----- .../multiple-parameters/apis/StoreApi.ts | 32 ++--- .../multiple-parameters/apis/UserApi.ts | 64 ++++----- .../builds/multiple-parameters/runtime.ts | 9 +- .../src/apis/PetApi.ts | 64 ++++----- .../src/apis/StoreApi.ts | 32 ++--- .../src/apis/UserApi.ts | 64 ++++----- .../src/runtime.ts | 9 +- .../sagas-and-records/src/apis/BehaviorApi.ts | 16 +-- .../sagas-and-records/src/apis/PetApi.ts | 80 +++++------ .../sagas-and-records/src/apis/PetPartApi.ts | 16 +-- .../sagas-and-records/src/apis/StoreApi.ts | 32 ++--- .../sagas-and-records/src/apis/UserApi.ts | 64 ++++----- .../builds/sagas-and-records/src/runtime.ts | 9 +- .../typescript-three-plus/src/apis/PetApi.ts | 64 ++++----- .../src/apis/StoreApi.ts | 32 ++--- .../typescript-three-plus/src/apis/UserApi.ts | 64 ++++----- .../typescript-three-plus/src/runtime.ts | 9 +- .../builds/with-interfaces/apis/PetApi.ts | 96 ++++++------- .../builds/with-interfaces/apis/StoreApi.ts | 48 +++---- .../builds/with-interfaces/apis/UserApi.ts | 96 ++++++------- .../builds/with-interfaces/runtime.ts | 9 +- .../with-npm-version/src/apis/PetApi.ts | 64 ++++----- .../with-npm-version/src/apis/StoreApi.ts | 32 ++--- .../with-npm-version/src/apis/UserApi.ts | 64 ++++----- .../builds/with-npm-version/src/runtime.ts | 9 +- .../without-runtime-checks/src/apis/PetApi.ts | 64 ++++----- .../src/apis/StoreApi.ts | 32 ++--- .../src/apis/UserApi.ts | 64 ++++----- .../without-runtime-checks/src/runtime.ts | 9 +- 50 files changed, 1035 insertions(+), 1023 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 851b9ce3831..f9dfb7c77e2 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -49,7 +49,7 @@ export interface {{classname}}Interface { * @throws {RequiredError} * @memberof {{classname}}Interface */ - {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise>; + {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit): Promise>; /** {{#notes}} @@ -60,10 +60,10 @@ export interface {{classname}}Interface { {{/summary}} */ {{^useSingleRequestParameter}} - {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}{{/allParams}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; + {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; {{/useSingleRequestParameter}} {{#useSingleRequestParameter}} - {{nickname}}({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; + {{nickname}}({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; {{/useSingleRequestParameter}} {{/operation}} @@ -91,7 +91,7 @@ export class {{classname}} extends runtime.BaseAPI { * {{&summary}} {{/summary}} */ - async {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise> { + async {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit): Promise> { {{#allParams}} {{#required}} if (requestParameters.{{paramName}} === null || requestParameters.{{paramName}} === undefined) { @@ -284,7 +284,7 @@ export class {{classname}} extends runtime.BaseAPI { {{#hasFormParams}} body: formParams, {{/hasFormParams}} - }); + }, initOverrides); {{#returnType}} {{#isResponseFile}} @@ -331,24 +331,24 @@ export class {{classname}} extends runtime.BaseAPI { {{/summary}} */ {{^useSingleRequestParameter}} - async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}{{/allParams}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { + async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { {{#returnType}} - const response = await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}} }{{/allParams.0}}); + const response = await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}} }, {{/allParams.0}}initOverrides); return await response.value(); {{/returnType}} {{^returnType}} - await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}} }{{/allParams.0}}); + await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}} }{{/allParams.0}}, initOverrides); {{/returnType}} } {{/useSingleRequestParameter}} {{#useSingleRequestParameter}} - async {{nickname}}({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { + async {{nickname}}({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { {{#returnType}} - const response = await this.{{nickname}}Raw({{#allParams.0}}requestParameters{{/allParams.0}}); + const response = await this.{{nickname}}Raw({{#allParams.0}}requestParameters, {{/allParams.0}}initOverrides); return await response.value(); {{/returnType}} {{^returnType}} - await this.{{nickname}}Raw({{#allParams.0}}requestParameters{{/allParams.0}}); + await this.{{nickname}}Raw({{#allParams.0}}requestParameters, {{/allParams.0}}initOverrides); {{/returnType}} } {{/useSingleRequestParameter}} 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 3532836aba0..fb23ec78881 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -33,8 +33,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -42,7 +42,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -59,7 +59,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts index 58010c352a1..d17d6d97658 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts @@ -33,7 +33,7 @@ export class AnotherFakeApi extends runtime.BaseAPI { * To test special tags and operation ID starting with number * To test special tags */ - async _123testSpecialTagsRaw(requestParameters: 123testSpecialTagsRequest): Promise> { + async _123testSpecialTagsRaw(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.client === null || requestParameters.client === undefined) { throw new runtime.RequiredError('client','Required parameter requestParameters.client was null or undefined when calling _123testSpecialTags.'); } @@ -50,7 +50,7 @@ export class AnotherFakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: ClientToJSON(requestParameters.client), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ClientFromJSON(jsonValue)); } @@ -59,8 +59,8 @@ export class AnotherFakeApi extends runtime.BaseAPI { * To test special tags and operation ID starting with number * To test special tags */ - async _123testSpecialTags(requestParameters: 123testSpecialTagsRequest): Promise { - const response = await this._123testSpecialTagsRaw(requestParameters); + async _123testSpecialTags(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit): Promise { + const response = await this._123testSpecialTagsRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts index 0b582e38d9f..4cc88f15b5d 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts @@ -27,7 +27,7 @@ export class DefaultApi extends runtime.BaseAPI { /** */ - async fooGetRaw(): Promise> { + async fooGetRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -37,15 +37,15 @@ export class DefaultApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => InlineResponseDefaultFromJSON(jsonValue)); } /** */ - async fooGet(): Promise { - const response = await this.fooGetRaw(); + async fooGet(initOverrides?: RequestInit): Promise { + const response = await this.fooGetRaw(initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts index 31f05a52858..1d3f0ee707a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts @@ -143,7 +143,7 @@ export class FakeApi extends runtime.BaseAPI { /** * Health check endpoint */ - async fakeHealthGetRaw(): Promise> { + async fakeHealthGetRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -153,7 +153,7 @@ export class FakeApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => HealthCheckResultFromJSON(jsonValue)); } @@ -161,15 +161,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Health check endpoint */ - async fakeHealthGet(): Promise { - const response = await this.fakeHealthGetRaw(); + async fakeHealthGet(initOverrides?: RequestInit): Promise { + const response = await this.fakeHealthGetRaw(initOverrides); return await response.value(); } /** * test http signature authentication */ - async fakeHttpSignatureTestRaw(requestParameters: FakeHttpSignatureTestRequest): Promise> { + async fakeHttpSignatureTestRaw(requestParameters: FakeHttpSignatureTestRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.pet === null || requestParameters.pet === undefined) { throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling fakeHttpSignatureTest.'); } @@ -194,7 +194,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.pet), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -202,14 +202,14 @@ export class FakeApi extends runtime.BaseAPI { /** * test http signature authentication */ - async fakeHttpSignatureTest(requestParameters: FakeHttpSignatureTestRequest): Promise { - await this.fakeHttpSignatureTestRaw(requestParameters); + async fakeHttpSignatureTest(requestParameters: FakeHttpSignatureTestRequest, initOverrides?: RequestInit): Promise { + await this.fakeHttpSignatureTestRaw(requestParameters, initOverrides); } /** * Test serialization of outer boolean types */ - async fakeOuterBooleanSerializeRaw(requestParameters: FakeOuterBooleanSerializeRequest): Promise> { + async fakeOuterBooleanSerializeRaw(requestParameters: FakeOuterBooleanSerializeRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -222,7 +222,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body as any, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -230,15 +230,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Test serialization of outer boolean types */ - async fakeOuterBooleanSerialize(requestParameters: FakeOuterBooleanSerializeRequest): Promise { - const response = await this.fakeOuterBooleanSerializeRaw(requestParameters); + async fakeOuterBooleanSerialize(requestParameters: FakeOuterBooleanSerializeRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeOuterBooleanSerializeRaw(requestParameters, initOverrides); return await response.value(); } /** * Test serialization of object with outer number type */ - async fakeOuterCompositeSerializeRaw(requestParameters: FakeOuterCompositeSerializeRequest): Promise> { + async fakeOuterCompositeSerializeRaw(requestParameters: FakeOuterCompositeSerializeRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -251,7 +251,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OuterCompositeToJSON(requestParameters.outerComposite), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OuterCompositeFromJSON(jsonValue)); } @@ -259,15 +259,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Test serialization of object with outer number type */ - async fakeOuterCompositeSerialize(requestParameters: FakeOuterCompositeSerializeRequest): Promise { - const response = await this.fakeOuterCompositeSerializeRaw(requestParameters); + async fakeOuterCompositeSerialize(requestParameters: FakeOuterCompositeSerializeRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeOuterCompositeSerializeRaw(requestParameters, initOverrides); return await response.value(); } /** * Test serialization of outer number types */ - async fakeOuterNumberSerializeRaw(requestParameters: FakeOuterNumberSerializeRequest): Promise> { + async fakeOuterNumberSerializeRaw(requestParameters: FakeOuterNumberSerializeRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -280,7 +280,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body as any, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -288,15 +288,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Test serialization of outer number types */ - async fakeOuterNumberSerialize(requestParameters: FakeOuterNumberSerializeRequest): Promise { - const response = await this.fakeOuterNumberSerializeRaw(requestParameters); + async fakeOuterNumberSerialize(requestParameters: FakeOuterNumberSerializeRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeOuterNumberSerializeRaw(requestParameters, initOverrides); return await response.value(); } /** * Test serialization of outer string types */ - async fakeOuterStringSerializeRaw(requestParameters: FakeOuterStringSerializeRequest): Promise> { + async fakeOuterStringSerializeRaw(requestParameters: FakeOuterStringSerializeRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -309,7 +309,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body as any, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -317,15 +317,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Test serialization of outer string types */ - async fakeOuterStringSerialize(requestParameters: FakeOuterStringSerializeRequest): Promise { - const response = await this.fakeOuterStringSerializeRaw(requestParameters); + async fakeOuterStringSerialize(requestParameters: FakeOuterStringSerializeRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeOuterStringSerializeRaw(requestParameters, initOverrides); return await response.value(); } /** * Test serialization of enum (int) properties with examples */ - async fakePropertyEnumIntegerSerializeRaw(requestParameters: FakePropertyEnumIntegerSerializeRequest): Promise> { + async fakePropertyEnumIntegerSerializeRaw(requestParameters: FakePropertyEnumIntegerSerializeRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.outerObjectWithEnumProperty === null || requestParameters.outerObjectWithEnumProperty === undefined) { throw new runtime.RequiredError('outerObjectWithEnumProperty','Required parameter requestParameters.outerObjectWithEnumProperty was null or undefined when calling fakePropertyEnumIntegerSerialize.'); } @@ -342,7 +342,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OuterObjectWithEnumPropertyToJSON(requestParameters.outerObjectWithEnumProperty), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OuterObjectWithEnumPropertyFromJSON(jsonValue)); } @@ -350,15 +350,15 @@ export class FakeApi extends runtime.BaseAPI { /** * Test serialization of enum (int) properties with examples */ - async fakePropertyEnumIntegerSerialize(requestParameters: FakePropertyEnumIntegerSerializeRequest): Promise { - const response = await this.fakePropertyEnumIntegerSerializeRaw(requestParameters); + async fakePropertyEnumIntegerSerialize(requestParameters: FakePropertyEnumIntegerSerializeRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakePropertyEnumIntegerSerializeRaw(requestParameters, initOverrides); return await response.value(); } /** * For this test, the body has to be a binary file. */ - async testBodyWithBinaryRaw(requestParameters: TestBodyWithBinaryRequest): Promise> { + async testBodyWithBinaryRaw(requestParameters: TestBodyWithBinaryRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling testBodyWithBinary.'); } @@ -375,7 +375,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body as any, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -383,14 +383,14 @@ export class FakeApi extends runtime.BaseAPI { /** * For this test, the body has to be a binary file. */ - async testBodyWithBinary(requestParameters: TestBodyWithBinaryRequest): Promise { - await this.testBodyWithBinaryRaw(requestParameters); + async testBodyWithBinary(requestParameters: TestBodyWithBinaryRequest, initOverrides?: RequestInit): Promise { + await this.testBodyWithBinaryRaw(requestParameters, initOverrides); } /** * For this test, the body for this request must reference a schema named `File`. */ - async testBodyWithFileSchemaRaw(requestParameters: TestBodyWithFileSchemaRequest): Promise> { + async testBodyWithFileSchemaRaw(requestParameters: TestBodyWithFileSchemaRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.fileSchemaTestClass === null || requestParameters.fileSchemaTestClass === undefined) { throw new runtime.RequiredError('fileSchemaTestClass','Required parameter requestParameters.fileSchemaTestClass was null or undefined when calling testBodyWithFileSchema.'); } @@ -407,7 +407,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: FileSchemaTestClassToJSON(requestParameters.fileSchemaTestClass), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -415,13 +415,13 @@ export class FakeApi extends runtime.BaseAPI { /** * For this test, the body for this request must reference a schema named `File`. */ - async testBodyWithFileSchema(requestParameters: TestBodyWithFileSchemaRequest): Promise { - await this.testBodyWithFileSchemaRaw(requestParameters); + async testBodyWithFileSchema(requestParameters: TestBodyWithFileSchemaRequest, initOverrides?: RequestInit): Promise { + await this.testBodyWithFileSchemaRaw(requestParameters, initOverrides); } /** */ - async testBodyWithQueryParamsRaw(requestParameters: TestBodyWithQueryParamsRequest): Promise> { + async testBodyWithQueryParamsRaw(requestParameters: TestBodyWithQueryParamsRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.query === null || requestParameters.query === undefined) { throw new runtime.RequiredError('query','Required parameter requestParameters.query was null or undefined when calling testBodyWithQueryParams.'); } @@ -446,22 +446,22 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.user), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } /** */ - async testBodyWithQueryParams(requestParameters: TestBodyWithQueryParamsRequest): Promise { - await this.testBodyWithQueryParamsRaw(requestParameters); + async testBodyWithQueryParams(requestParameters: TestBodyWithQueryParamsRequest, initOverrides?: RequestInit): Promise { + await this.testBodyWithQueryParamsRaw(requestParameters, initOverrides); } /** * To test \"client\" model * To test \"client\" model */ - async testClientModelRaw(requestParameters: TestClientModelRequest): Promise> { + async testClientModelRaw(requestParameters: TestClientModelRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.client === null || requestParameters.client === undefined) { throw new runtime.RequiredError('client','Required parameter requestParameters.client was null or undefined when calling testClientModel.'); } @@ -478,7 +478,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: ClientToJSON(requestParameters.client), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ClientFromJSON(jsonValue)); } @@ -487,8 +487,8 @@ export class FakeApi extends runtime.BaseAPI { * To test \"client\" model * To test \"client\" model */ - async testClientModel(requestParameters: TestClientModelRequest): Promise { - const response = await this.testClientModelRaw(requestParameters); + async testClientModel(requestParameters: TestClientModelRequest, initOverrides?: RequestInit): Promise { + const response = await this.testClientModelRaw(requestParameters, initOverrides); return await response.value(); } @@ -496,7 +496,7 @@ export class FakeApi extends runtime.BaseAPI { * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 */ - async testEndpointParametersRaw(requestParameters: TestEndpointParametersRequest): Promise> { + async testEndpointParametersRaw(requestParameters: TestEndpointParametersRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.number === null || requestParameters.number === undefined) { throw new runtime.RequiredError('number','Required parameter requestParameters.number was null or undefined when calling testEndpointParameters.'); } @@ -598,7 +598,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -607,15 +607,15 @@ export class FakeApi extends runtime.BaseAPI { * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 */ - async testEndpointParameters(requestParameters: TestEndpointParametersRequest): Promise { - await this.testEndpointParametersRaw(requestParameters); + async testEndpointParameters(requestParameters: TestEndpointParametersRequest, initOverrides?: RequestInit): Promise { + await this.testEndpointParametersRaw(requestParameters, initOverrides); } /** * To test enum parameters * To test enum parameters */ - async testEnumParametersRaw(requestParameters: TestEnumParametersRequest): Promise> { + async testEnumParametersRaw(requestParameters: TestEnumParametersRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; if (requestParameters.enumQueryStringArray) { @@ -672,7 +672,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -681,15 +681,15 @@ export class FakeApi extends runtime.BaseAPI { * To test enum parameters * To test enum parameters */ - async testEnumParameters(requestParameters: TestEnumParametersRequest): Promise { - await this.testEnumParametersRaw(requestParameters); + async testEnumParameters(requestParameters: TestEnumParametersRequest, initOverrides?: RequestInit): Promise { + await this.testEnumParametersRaw(requestParameters, initOverrides); } /** * Fake endpoint to test group parameters (optional) * Fake endpoint to test group parameters (optional) */ - async testGroupParametersRaw(requestParameters: TestGroupParametersRequest): Promise> { + async testGroupParametersRaw(requestParameters: TestGroupParametersRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.requiredStringGroup === null || requestParameters.requiredStringGroup === undefined) { throw new runtime.RequiredError('requiredStringGroup','Required parameter requestParameters.requiredStringGroup was null or undefined when calling testGroupParameters.'); } @@ -743,7 +743,7 @@ export class FakeApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -752,14 +752,14 @@ export class FakeApi extends runtime.BaseAPI { * Fake endpoint to test group parameters (optional) * Fake endpoint to test group parameters (optional) */ - async testGroupParameters(requestParameters: TestGroupParametersRequest): Promise { - await this.testGroupParametersRaw(requestParameters); + async testGroupParameters(requestParameters: TestGroupParametersRequest, initOverrides?: RequestInit): Promise { + await this.testGroupParametersRaw(requestParameters, initOverrides); } /** * test inline additionalProperties */ - async testInlineAdditionalPropertiesRaw(requestParameters: TestInlineAdditionalPropertiesRequest): Promise> { + async testInlineAdditionalPropertiesRaw(requestParameters: TestInlineAdditionalPropertiesRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.requestBody === null || requestParameters.requestBody === undefined) { throw new runtime.RequiredError('requestBody','Required parameter requestParameters.requestBody was null or undefined when calling testInlineAdditionalProperties.'); } @@ -776,7 +776,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.requestBody, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -784,14 +784,14 @@ export class FakeApi extends runtime.BaseAPI { /** * test inline additionalProperties */ - async testInlineAdditionalProperties(requestParameters: TestInlineAdditionalPropertiesRequest): Promise { - await this.testInlineAdditionalPropertiesRaw(requestParameters); + async testInlineAdditionalProperties(requestParameters: TestInlineAdditionalPropertiesRequest, initOverrides?: RequestInit): Promise { + await this.testInlineAdditionalPropertiesRaw(requestParameters, initOverrides); } /** * test json serialization of form data */ - async testJsonFormDataRaw(requestParameters: TestJsonFormDataRequest): Promise> { + async testJsonFormDataRaw(requestParameters: TestJsonFormDataRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.param === null || requestParameters.param === undefined) { throw new runtime.RequiredError('param','Required parameter requestParameters.param was null or undefined when calling testJsonFormData.'); } @@ -832,7 +832,7 @@ export class FakeApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -840,14 +840,14 @@ export class FakeApi extends runtime.BaseAPI { /** * test json serialization of form data */ - async testJsonFormData(requestParameters: TestJsonFormDataRequest): Promise { - await this.testJsonFormDataRaw(requestParameters); + async testJsonFormData(requestParameters: TestJsonFormDataRequest, initOverrides?: RequestInit): Promise { + await this.testJsonFormDataRaw(requestParameters, initOverrides); } /** * To test the collection format in query parameters */ - async testQueryParameterCollectionFormatRaw(requestParameters: TestQueryParameterCollectionFormatRequest): Promise> { + async testQueryParameterCollectionFormatRaw(requestParameters: TestQueryParameterCollectionFormatRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.pipe === null || requestParameters.pipe === undefined) { throw new runtime.RequiredError('pipe','Required parameter requestParameters.pipe was null or undefined when calling testQueryParameterCollectionFormat.'); } @@ -897,7 +897,7 @@ export class FakeApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -905,8 +905,8 @@ export class FakeApi extends runtime.BaseAPI { /** * To test the collection format in query parameters */ - async testQueryParameterCollectionFormat(requestParameters: TestQueryParameterCollectionFormatRequest): Promise { - await this.testQueryParameterCollectionFormatRaw(requestParameters); + async testQueryParameterCollectionFormat(requestParameters: TestQueryParameterCollectionFormatRequest, initOverrides?: RequestInit): Promise { + await this.testQueryParameterCollectionFormatRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts index a19a91a61f0..ec6b4d6a6e9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts @@ -33,7 +33,7 @@ export class FakeClassnameTags123Api extends runtime.BaseAPI { * To test class name in snake case * To test class name in snake case */ - async testClassnameRaw(requestParameters: TestClassnameRequest): Promise> { + async testClassnameRaw(requestParameters: TestClassnameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.client === null || requestParameters.client === undefined) { throw new runtime.RequiredError('client','Required parameter requestParameters.client was null or undefined when calling testClassname.'); } @@ -54,7 +54,7 @@ export class FakeClassnameTags123Api extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: ClientToJSON(requestParameters.client), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ClientFromJSON(jsonValue)); } @@ -63,8 +63,8 @@ export class FakeClassnameTags123Api extends runtime.BaseAPI { * To test class name in snake case * To test class name in snake case */ - async testClassname(requestParameters: TestClassnameRequest): Promise { - const response = await this.testClassnameRaw(requestParameters); + async testClassname(requestParameters: TestClassnameRequest, initOverrides?: RequestInit): Promise { + const response = await this.testClassnameRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts index 198794ce8b0..7956683bec1 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts @@ -74,7 +74,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.pet === null || requestParameters.pet === undefined) { throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } @@ -96,7 +96,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.pet), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -104,14 +104,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -134,7 +134,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -142,15 +142,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -173,7 +173,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -182,8 +182,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -191,7 +191,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -214,7 +214,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => new Set(jsonValue.map(PetFromJSON))); } @@ -223,8 +223,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -232,7 +232,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -250,7 +250,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -259,15 +259,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.pet === null || requestParameters.pet === undefined) { throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } @@ -289,7 +289,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.pet), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -297,14 +297,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -346,7 +346,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -354,14 +354,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -405,7 +405,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -413,15 +413,15 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } /** * uploads an image (required) */ - async uploadFileWithRequiredFileRaw(requestParameters: UploadFileWithRequiredFileRequest): Promise> { + async uploadFileWithRequiredFileRaw(requestParameters: UploadFileWithRequiredFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFileWithRequiredFile.'); } @@ -469,7 +469,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -477,8 +477,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image (required) */ - async uploadFileWithRequiredFile(requestParameters: UploadFileWithRequiredFileRequest): Promise { - const response = await this.uploadFileWithRequiredFileRaw(requestParameters); + async uploadFileWithRequiredFile(requestParameters: UploadFileWithRequiredFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileWithRequiredFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts index 1f9a8277200..d13b72accd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.order === null || requestParameters.order === undefined) { throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.order), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts index 689cd6c66f9..5263414a0f0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.user === null || requestParameters.user === undefined) { throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.user), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.user === null || requestParameters.user === undefined) { throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.user.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.user === null || requestParameters.user === undefined) { throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.user.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.user), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts index 4954bd81789..a310e79b907 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 3bf150e489b..e4ddf7e853a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index e3c0f89691a..86866341712 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 2e57d7b18ff..1523fcfb7e8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts index e12a57a4481..844842111c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts @@ -61,7 +61,7 @@ export class DefaultApi extends runtime.BaseAPI { /** */ - async fakeEnumRequestGetInlineRaw(requestParameters: FakeEnumRequestGetInlineRequest): Promise> { + async fakeEnumRequestGetInlineRaw(requestParameters: FakeEnumRequestGetInlineRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; if (requestParameters.stringEnum !== undefined) { @@ -87,21 +87,21 @@ export class DefaultApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => InlineResponse200FromJSON(jsonValue)); } /** */ - async fakeEnumRequestGetInline(requestParameters: FakeEnumRequestGetInlineRequest): Promise { - const response = await this.fakeEnumRequestGetInlineRaw(requestParameters); + async fakeEnumRequestGetInline(requestParameters: FakeEnumRequestGetInlineRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeEnumRequestGetInlineRaw(requestParameters, initOverrides); return await response.value(); } /** */ - async fakeEnumRequestGetRefRaw(requestParameters: FakeEnumRequestGetRefRequest): Promise> { + async fakeEnumRequestGetRefRaw(requestParameters: FakeEnumRequestGetRefRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; if (requestParameters.stringEnum !== undefined) { @@ -127,21 +127,21 @@ export class DefaultApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => EnumPatternObjectFromJSON(jsonValue)); } /** */ - async fakeEnumRequestGetRef(requestParameters: FakeEnumRequestGetRefRequest): Promise { - const response = await this.fakeEnumRequestGetRefRaw(requestParameters); + async fakeEnumRequestGetRef(requestParameters: FakeEnumRequestGetRefRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeEnumRequestGetRefRaw(requestParameters, initOverrides); return await response.value(); } /** */ - async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest): Promise> { + async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -154,21 +154,21 @@ export class DefaultApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: InlineObjectToJSON(requestParameters.inlineObject), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => InlineObjectFromJSON(jsonValue)); } /** */ - async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest): Promise { - const response = await this.fakeEnumRequestPostInlineRaw(requestParameters); + async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeEnumRequestPostInlineRaw(requestParameters, initOverrides); return await response.value(); } /** */ - async fakeEnumRequestPostRefRaw(requestParameters: FakeEnumRequestPostRefRequest): Promise> { + async fakeEnumRequestPostRefRaw(requestParameters: FakeEnumRequestPostRefRequest, initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -181,15 +181,15 @@ export class DefaultApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: EnumPatternObjectToJSON(requestParameters.enumPatternObject), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => EnumPatternObjectFromJSON(jsonValue)); } /** */ - async fakeEnumRequestPostRef(requestParameters: FakeEnumRequestPostRefRequest): Promise { - const response = await this.fakeEnumRequestPostRefRaw(requestParameters); + async fakeEnumRequestPostRef(requestParameters: FakeEnumRequestPostRefRequest, initOverrides?: RequestInit): Promise { + const response = await this.fakeEnumRequestPostRefRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts index fceb79bf4c4..1d73582a193 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts index 3bf150e489b..e4ddf7e853a 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts index e3c0f89691a..86866341712 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts index 2e57d7b18ff..1523fcfb7e8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts index db5971d0ad5..15a4a866e5b 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(body: Pet): Promise { - await this.addPetRaw({ body: body }); + async addPet(body: Pet, initOverrides?: RequestInit): Promise { + await this.addPetRaw({ body: body }, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(petId: number, apiKey?: string): Promise { - await this.deletePetRaw({ petId: petId, apiKey: apiKey }); + async deletePet(petId: number, , apiKey?: string, initOverrides?: RequestInit): Promise { + await this.deletePetRaw({ petId: petId, apiKey: apiKey }, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(status: Array): Promise> { - const response = await this.findPetsByStatusRaw({ status: status }); + async findPetsByStatus(status: Array, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw({ status: status }, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(tags: Array): Promise> { - const response = await this.findPetsByTagsRaw({ tags: tags }); + async findPetsByTags(tags: Array, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw({ tags: tags }, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(petId: number): Promise { - const response = await this.getPetByIdRaw({ petId: petId }); + async getPetById(petId: number, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw({ petId: petId }, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(body: Pet): Promise { - await this.updatePetRaw({ body: body }); + async updatePet(body: Pet, initOverrides?: RequestInit): Promise { + await this.updatePetRaw({ body: body }, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(petId: number, name?: string, status?: string): Promise { - await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }); + async updatePetWithForm(petId: number, , name?: string, , status?: string, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(petId: number, additionalMetadata?: string, file?: Blob): Promise { - const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }); + async uploadFile(petId: number, , additionalMetadata?: string, , file?: Blob, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts index 51382e766aa..02bf161b01a 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(orderId: string): Promise { - await this.deleteOrderRaw({ orderId: orderId }); + async deleteOrder(orderId: string, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw({ orderId: orderId }, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(orderId: number): Promise { - const response = await this.getOrderByIdRaw({ orderId: orderId }); + async getOrderById(orderId: number, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw({ orderId: orderId }, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(body: Order): Promise { - const response = await this.placeOrderRaw({ body: body }); + async placeOrder(body: Order, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw({ body: body }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts index 922b79e9b50..cc66bd9b1af 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(body: User): Promise { - await this.createUserRaw({ body: body }); + async createUser(body: User, initOverrides?: RequestInit): Promise { + await this.createUserRaw({ body: body }, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(body: Array): Promise { - await this.createUsersWithArrayInputRaw({ body: body }); + async createUsersWithArrayInput(body: Array, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw({ body: body }, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(body: Array): Promise { - await this.createUsersWithListInputRaw({ body: body }); + async createUsersWithListInput(body: Array, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw({ body: body }, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(username: string): Promise { - await this.deleteUserRaw({ username: username }); + async deleteUser(username: string, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw({ username: username }, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(username: string): Promise { - const response = await this.getUserByNameRaw({ username: username }); + async getUserByName(username: string, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw({ username: username }, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(username: string, password: string): Promise { - const response = await this.loginUserRaw({ username: username, password: password }); + async loginUser(username: string, , password: string, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw({ username: username, password: password }, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(, initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(username: string, body: User): Promise { - await this.updateUserRaw({ username: username, body: body }); + async updateUser(username: string, , body: User, initOverrides?: RequestInit): Promise { + await this.updateUserRaw({ username: username, body: body }, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts index e2fd699fd73..28c305f52e1 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: PetApiAddPetRequest): Promise> { + async addPetRaw(requestParameters: PetApiAddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: PetApiAddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: PetApiAddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: PetApiDeletePetRequest): Promise> { + async deletePetRaw(requestParameters: PetApiDeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: PetApiDeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: PetApiDeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: PetApiFindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: PetApiFindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: PetApiFindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: PetApiFindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: PetApiFindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: PetApiFindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: PetApiFindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: PetApiFindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: PetApiGetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: PetApiGetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: PetApiGetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: PetApiGetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: PetApiUpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: PetApiUpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: PetApiUpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: PetApiUpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: PetApiUpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: PetApiUpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: PetApiUpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: PetApiUpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: PetApiUploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: PetApiUploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: PetApiUploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: PetApiUploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts index 7ac2687add0..86ccb992f76 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: StoreApiDeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: StoreApiDeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: StoreApiDeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: StoreApiDeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: StoreApiGetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: StoreApiGetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: StoreApiGetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: StoreApiGetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: StoreApiPlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: StoreApiPlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: StoreApiPlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: StoreApiPlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts index e4a6a8b81db..0ea48c08a3a 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: UserApiCreateUserRequest): Promise> { + async createUserRaw(requestParameters: UserApiCreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: UserApiCreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: UserApiCreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: UserApiCreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: UserApiCreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: UserApiCreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: UserApiCreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: UserApiCreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: UserApiCreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: UserApiCreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: UserApiCreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: UserApiDeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: UserApiDeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: UserApiDeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: UserApiDeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: UserApiGetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: UserApiGetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: UserApiGetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: UserApiGetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: UserApiLoginUserRequest): Promise> { + async loginUserRaw(requestParameters: UserApiLoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: UserApiLoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: UserApiLoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UserApiUpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UserApiUpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UserApiUpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UserApiUpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts index 82adc068a8a..269fafc9fcd 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts @@ -39,7 +39,7 @@ export class BehaviorApi extends runtime.BaseAPI { /** * Get permissions for the behavior */ - async getBehaviorPermissionsRaw(requestParameters: GetBehaviorPermissionsRequest): Promise> { + async getBehaviorPermissionsRaw(requestParameters: GetBehaviorPermissionsRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.behaviorId === null || requestParameters.behaviorId === undefined) { throw new runtime.RequiredError('behaviorId','Required parameter requestParameters.behaviorId was null or undefined when calling getBehaviorPermissions.'); } @@ -53,7 +53,7 @@ export class BehaviorApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => GetBehaviorPermissionsResponseFromJSON(jsonValue)); } @@ -61,15 +61,15 @@ export class BehaviorApi extends runtime.BaseAPI { /** * Get permissions for the behavior */ - async getBehaviorPermissions(behaviorId: number): Promise { - const response = await this.getBehaviorPermissionsRaw({ behaviorId: behaviorId }); + async getBehaviorPermissions(behaviorId: number, initOverrides?: RequestInit): Promise { + const response = await this.getBehaviorPermissionsRaw({ behaviorId: behaviorId }, initOverrides); return await response.value(); } /** * Get the type of behavior */ - async getBehaviorTypeRaw(requestParameters: GetBehaviorTypeRequest): Promise> { + async getBehaviorTypeRaw(requestParameters: GetBehaviorTypeRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.behaviorId === null || requestParameters.behaviorId === undefined) { throw new runtime.RequiredError('behaviorId','Required parameter requestParameters.behaviorId was null or undefined when calling getBehaviorType.'); } @@ -83,7 +83,7 @@ export class BehaviorApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => GetBehaviorTypeResponseFromJSON(jsonValue)); } @@ -91,8 +91,8 @@ export class BehaviorApi extends runtime.BaseAPI { /** * Get the type of behavior */ - async getBehaviorType(behaviorId: number): Promise { - const response = await this.getBehaviorTypeRaw({ behaviorId: behaviorId }); + async getBehaviorType(behaviorId: number, initOverrides?: RequestInit): Promise { + const response = await this.getBehaviorTypeRaw({ behaviorId: behaviorId }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts index 5c881e816cd..262aaaa131f 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts @@ -85,7 +85,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.dummyCat === null || requestParameters.dummyCat === undefined) { throw new runtime.RequiredError('dummyCat','Required parameter requestParameters.dummyCat was null or undefined when calling addPet.'); } @@ -107,7 +107,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: CategoryToJSON(requestParameters.dummyCat), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -115,14 +115,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(dummyCat: Category): Promise { - await this.addPetRaw({ dummyCat: dummyCat }); + async addPet(dummyCat: Category, initOverrides?: RequestInit): Promise { + await this.addPetRaw({ dummyCat: dummyCat }, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -145,7 +145,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -153,15 +153,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(petId: number, apiKey?: string): Promise { - await this.deletePetRaw({ petId: petId, apiKey: apiKey }); + async deletePet(petId: number, , apiKey?: string, initOverrides?: RequestInit): Promise { + await this.deletePetRaw({ petId: petId, apiKey: apiKey }, initOverrides); } /** * Multiple ids can be provided with comma separated strings. * Finds Pets by ids */ - async findPetsByIdsRaw(requestParameters: FindPetsByIdsRequest): Promise>> { + async findPetsByIdsRaw(requestParameters: FindPetsByIdsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.ids === null || requestParameters.ids === undefined) { throw new runtime.RequiredError('ids','Required parameter requestParameters.ids was null or undefined when calling findPetsByIds.'); } @@ -184,7 +184,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -193,8 +193,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple ids can be provided with comma separated strings. * Finds Pets by ids */ - async findPetsByIds(ids: Array): Promise> { - const response = await this.findPetsByIdsRaw({ ids: ids }); + async findPetsByIds(ids: Array, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByIdsRaw({ ids: ids }, initOverrides); return await response.value(); } @@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -225,7 +225,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => FindPetsByStatusResponseFromJSON(jsonValue)); } @@ -234,8 +234,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(status: Array): Promise { - const response = await this.findPetsByStatusRaw({ status: status }); + async findPetsByStatus(status: Array, initOverrides?: RequestInit): Promise { + const response = await this.findPetsByStatusRaw({ status: status }, initOverrides); return await response.value(); } @@ -243,7 +243,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -266,7 +266,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -275,8 +275,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(tags: Array): Promise> { - const response = await this.findPetsByTagsRaw({ tags: tags }); + async findPetsByTags(tags: Array, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw({ tags: tags }, initOverrides); return await response.value(); } @@ -284,7 +284,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple ids can be provided with comma separated strings. * Finds Pets by user ids */ - async findPetsByUserIdsRaw(requestParameters: FindPetsByUserIdsRequest): Promise> { + async findPetsByUserIdsRaw(requestParameters: FindPetsByUserIdsRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.ids === null || requestParameters.ids === undefined) { throw new runtime.RequiredError('ids','Required parameter requestParameters.ids was null or undefined when calling findPetsByUserIds.'); } @@ -307,7 +307,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => FindPetsByUserResponseFromJSON(jsonValue)); } @@ -316,8 +316,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple ids can be provided with comma separated strings. * Finds Pets by user ids */ - async findPetsByUserIds(ids: Array): Promise { - const response = await this.findPetsByUserIdsRaw({ ids: ids }); + async findPetsByUserIds(ids: Array, initOverrides?: RequestInit): Promise { + const response = await this.findPetsByUserIdsRaw({ ids: ids }, initOverrides); return await response.value(); } @@ -325,7 +325,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -343,7 +343,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -352,15 +352,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(petId: number): Promise { - const response = await this.getPetByIdRaw({ petId: petId }); + async getPetById(petId: number, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw({ petId: petId }, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -382,7 +382,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -390,14 +390,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(body: Pet): Promise { - await this.updatePetRaw({ body: body }); + async updatePet(body: Pet, initOverrides?: RequestInit): Promise { + await this.updatePetRaw({ body: body }, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -439,7 +439,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -447,14 +447,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(petId: number, name?: string, status?: string): Promise { - await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }); + async updatePetWithForm(petId: number, , name?: string, , status?: string, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -498,7 +498,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -506,8 +506,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(petId: number, additionalMetadata?: string, file?: Blob): Promise { - const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }); + async uploadFile(petId: number, , additionalMetadata?: string, , file?: Blob, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts index 535059660a0..1586d3f0a9d 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts @@ -44,7 +44,7 @@ export class PetPartApi extends runtime.BaseAPI { /** * Returns single pet part type for the petPart id. */ - async getFakePetPartTypeRaw(requestParameters: GetFakePetPartTypeRequest): Promise> { + async getFakePetPartTypeRaw(requestParameters: GetFakePetPartTypeRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.fakePetPartId === null || requestParameters.fakePetPartId === undefined) { throw new runtime.RequiredError('fakePetPartId','Required parameter requestParameters.fakePetPartId was null or undefined when calling getFakePetPartType.'); } @@ -58,7 +58,7 @@ export class PetPartApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => GetPetPartTypeResponseFromJSON(jsonValue)); } @@ -66,15 +66,15 @@ export class PetPartApi extends runtime.BaseAPI { /** * Returns single pet part type for the petPart id. */ - async getFakePetPartType(fakePetPartId: number): Promise { - const response = await this.getFakePetPartTypeRaw({ fakePetPartId: fakePetPartId }); + async getFakePetPartType(fakePetPartId: number, initOverrides?: RequestInit): Promise { + const response = await this.getFakePetPartTypeRaw({ fakePetPartId: fakePetPartId }, initOverrides); return await response.value(); } /** * Get the matching parts for the given pet part. */ - async getMatchingPartsRaw(requestParameters: GetMatchingPartsRequest): Promise> { + async getMatchingPartsRaw(requestParameters: GetMatchingPartsRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.fakePetPartId === null || requestParameters.fakePetPartId === undefined) { throw new runtime.RequiredError('fakePetPartId','Required parameter requestParameters.fakePetPartId was null or undefined when calling getMatchingParts.'); } @@ -120,7 +120,7 @@ export class PetPartApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => GetMatchingPartsResponseFromJSON(jsonValue)); } @@ -128,8 +128,8 @@ export class PetPartApi extends runtime.BaseAPI { /** * Get the matching parts for the given pet part. */ - async getMatchingParts(fakePetPartId: number, _long: boolean, smooth: boolean, _short: boolean, name?: string, connectedPart?: string): Promise { - const response = await this.getMatchingPartsRaw({ fakePetPartId: fakePetPartId, _long: _long, smooth: smooth, _short: _short, name: name, connectedPart: connectedPart }); + async getMatchingParts(fakePetPartId: number, , _long: boolean, , smooth: boolean, , _short: boolean, , name?: string, , connectedPart?: string, initOverrides?: RequestInit): Promise { + const response = await this.getMatchingPartsRaw({ fakePetPartId: fakePetPartId, _long: _long, smooth: smooth, _short: _short, name: name, connectedPart: connectedPart }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts index 51382e766aa..02bf161b01a 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(orderId: string): Promise { - await this.deleteOrderRaw({ orderId: orderId }); + async deleteOrder(orderId: string, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw({ orderId: orderId }, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(orderId: number): Promise { - const response = await this.getOrderByIdRaw({ orderId: orderId }); + async getOrderById(orderId: number, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw({ orderId: orderId }, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(body: Order): Promise { - const response = await this.placeOrderRaw({ body: body }); + async placeOrder(body: Order, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw({ body: body }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts index 1bc763f8066..a55f4cf736a 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts @@ -62,7 +62,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -79,7 +79,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -88,14 +88,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(body: User): Promise { - await this.createUserRaw({ body: body }); + async createUser(body: User, initOverrides?: RequestInit): Promise { + await this.createUserRaw({ body: body }, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -112,7 +112,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -120,14 +120,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(body: Array): Promise { - await this.createUsersWithArrayInputRaw({ body: body }); + async createUsersWithArrayInput(body: Array, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw({ body: body }, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -144,7 +144,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -152,15 +152,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(body: Array): Promise { - await this.createUsersWithListInputRaw({ body: body }); + async createUsersWithListInput(body: Array, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw({ body: body }, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -174,7 +174,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -183,14 +183,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(username: string): Promise { - await this.deleteUserRaw({ username: username }); + async deleteUser(username: string, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw({ username: username }, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -204,7 +204,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -212,15 +212,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(username: string): Promise { - const response = await this.getUserByNameRaw({ username: username }); + async getUserByName(username: string, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw({ username: username }, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -246,7 +246,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -254,15 +254,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(username: string, password: string): Promise { - const response = await this.loginUserRaw({ username: username, password: password }); + async loginUser(username: string, , password: string, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw({ username: username, password: password }, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -272,7 +272,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -280,15 +280,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(, initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -309,7 +309,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => DefaultMetaOnlyResponseFromJSON(jsonValue)); } @@ -318,8 +318,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(username: string, body: User): Promise { - const response = await this.updateUserRaw({ username: username, body: body }); + async updateUser(username: string, , body: User, initOverrides?: RequestInit): Promise { + const response = await this.updateUserRaw({ username: username, body: body }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts index ccfe56260d8..fb1ccd134ef 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts index 3bf150e489b..e4ddf7e853a 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts index e3c0f89691a..86866341712 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts index 2e57d7b18ff..1523fcfb7e8 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts index ccfe56260d8..fb1ccd134ef 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index f8224fdb55f..9c3628a326d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -75,12 +75,12 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - addPetRaw(requestParameters: AddPetRequest): Promise>; + addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise>; /** * Add a new pet to the store */ - addPet(requestParameters: AddPetRequest): Promise; + addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise; /** * @@ -91,12 +91,12 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - deletePetRaw(requestParameters: DeletePetRequest): Promise>; + deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise>; /** * Deletes a pet */ - deletePet(requestParameters: DeletePetRequest): Promise; + deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise; /** * Multiple status values can be provided with comma separated strings @@ -106,13 +106,13 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>>; + findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>>; /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise>; + findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>; /** * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -122,13 +122,13 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>>; + findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>>; /** * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise>; + findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>; /** * Returns a single pet @@ -138,13 +138,13 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise>; + getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise>; /** * Returns a single pet * Find pet by ID */ - getPetById(requestParameters: GetPetByIdRequest): Promise; + getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise; /** * @@ -154,12 +154,12 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - updatePetRaw(requestParameters: UpdatePetRequest): Promise>; + updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise>; /** * Update an existing pet */ - updatePet(requestParameters: UpdatePetRequest): Promise; + updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise; /** * @@ -171,12 +171,12 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise>; + updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise>; /** * Updates a pet in the store with form data */ - updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise; + updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise; /** * @@ -188,12 +188,12 @@ export interface PetApiInterface { * @throws {RequiredError} * @memberof PetApiInterface */ - uploadFileRaw(requestParameters: UploadFileRequest): Promise>; + uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise>; /** * uploads an image */ - uploadFile(requestParameters: UploadFileRequest): Promise; + uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise; } @@ -205,7 +205,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -227,7 +227,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -235,14 +235,14 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -265,7 +265,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -273,15 +273,15 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -304,7 +304,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -313,8 +313,8 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -322,7 +322,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -345,7 +345,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -354,8 +354,8 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -363,7 +363,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -381,7 +381,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -390,15 +390,15 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -420,7 +420,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -428,14 +428,14 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -477,7 +477,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -485,14 +485,14 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -536,7 +536,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -544,8 +544,8 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 20edb9a49be..67ce9fbe2ab 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -47,13 +47,13 @@ export interface StoreApiInterface { * @throws {RequiredError} * @memberof StoreApiInterface */ - deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise>; + deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise>; /** * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - deleteOrder(requestParameters: DeleteOrderRequest): Promise; + deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise; /** * Returns a map of status codes to quantities @@ -62,13 +62,13 @@ export interface StoreApiInterface { * @throws {RequiredError} * @memberof StoreApiInterface */ - getInventoryRaw(): Promise>; + getInventoryRaw(initOverrides?: RequestInit): Promise>; /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - getInventory(): Promise<{ [key: string]: number; }>; + getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }>; /** * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions @@ -78,13 +78,13 @@ export interface StoreApiInterface { * @throws {RequiredError} * @memberof StoreApiInterface */ - getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise>; + getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise>; /** * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - getOrderById(requestParameters: GetOrderByIdRequest): Promise; + getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise; /** * @@ -94,12 +94,12 @@ export interface StoreApiInterface { * @throws {RequiredError} * @memberof StoreApiInterface */ - placeOrderRaw(requestParameters: PlaceOrderRequest): Promise>; + placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise>; /** * Place an order for a pet */ - placeOrder(requestParameters: PlaceOrderRequest): Promise; + placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise; } @@ -112,7 +112,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -135,15 +135,15 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -157,7 +157,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -166,8 +166,8 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -175,7 +175,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -189,7 +189,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -198,15 +198,15 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -223,7 +223,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -231,8 +231,8 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 85159f4221c..09345d7d923 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -65,13 +65,13 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - createUserRaw(requestParameters: CreateUserRequest): Promise>; + createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise>; /** * This can only be done by the logged in user. * Create user */ - createUser(requestParameters: CreateUserRequest): Promise; + createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise; /** * @@ -81,12 +81,12 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise>; + createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise>; /** * Creates list of users with given input array */ - createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise; + createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise; /** * @@ -96,12 +96,12 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise>; + createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise>; /** * Creates list of users with given input array */ - createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise; + createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise; /** * This can only be done by the logged in user. @@ -111,13 +111,13 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - deleteUserRaw(requestParameters: DeleteUserRequest): Promise>; + deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise>; /** * This can only be done by the logged in user. * Delete user */ - deleteUser(requestParameters: DeleteUserRequest): Promise; + deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise; /** * @@ -127,12 +127,12 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise>; + getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise>; /** * Get user by user name */ - getUserByName(requestParameters: GetUserByNameRequest): Promise; + getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise; /** * @@ -143,12 +143,12 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - loginUserRaw(requestParameters: LoginUserRequest): Promise>; + loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise>; /** * Logs user into the system */ - loginUser(requestParameters: LoginUserRequest): Promise; + loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise; /** * @@ -157,12 +157,12 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - logoutUserRaw(): Promise>; + logoutUserRaw(initOverrides?: RequestInit): Promise>; /** * Logs out current logged in user session */ - logoutUser(): Promise; + logoutUser(initOverrides?: RequestInit): Promise; /** * This can only be done by the logged in user. @@ -173,13 +173,13 @@ export interface UserApiInterface { * @throws {RequiredError} * @memberof UserApiInterface */ - updateUserRaw(requestParameters: UpdateUserRequest): Promise>; + updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise>; /** * This can only be done by the logged in user. * Updated user */ - updateUser(requestParameters: UpdateUserRequest): Promise; + updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise; } @@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -209,7 +209,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -218,14 +218,14 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -242,7 +242,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -250,14 +250,14 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -274,7 +274,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -282,15 +282,15 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -313,14 +313,14 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -334,7 +334,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -342,15 +342,15 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -376,7 +376,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -384,15 +384,15 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -402,7 +402,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -410,15 +410,15 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -439,7 +439,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -448,8 +448,8 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } 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 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts index 3bf150e489b..e4ddf7e853a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts @@ -68,7 +68,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -90,7 +90,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -98,14 +98,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -128,7 +128,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -136,15 +136,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -167,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -176,8 +176,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -185,7 +185,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -208,7 +208,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON)); } @@ -217,8 +217,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -226,7 +226,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -244,7 +244,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue)); } @@ -253,15 +253,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -283,7 +283,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: PetToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -291,14 +291,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -340,7 +340,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -348,14 +348,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -399,7 +399,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue)); } @@ -407,8 +407,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts index e3c0f89691a..86866341712 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts @@ -41,7 +41,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -55,7 +55,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -64,15 +64,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -86,7 +86,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -95,8 +95,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -104,7 +104,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -118,7 +118,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -127,15 +127,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -152,7 +152,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: OrderToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); } @@ -160,8 +160,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts index 2e57d7b18ff..1523fcfb7e8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts @@ -59,7 +59,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -76,7 +76,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -85,14 +85,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -117,14 +117,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -141,7 +141,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body.map(UserToJSON), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -149,15 +149,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -171,7 +171,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -180,14 +180,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -201,7 +201,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue)); } @@ -209,15 +209,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -243,7 +243,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -251,15 +251,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -269,7 +269,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -277,15 +277,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -306,7 +306,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: UserToJSON(requestParameters.body), - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -315,8 +315,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts index 063d760e6ca..42feab97e0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts @@ -64,7 +64,7 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPetRaw(requestParameters: AddPetRequest): Promise> { + async addPetRaw(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } @@ -86,7 +86,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -94,14 +94,14 @@ export class PetApi extends runtime.BaseAPI { /** * Add a new pet to the store */ - async addPet(requestParameters: AddPetRequest): Promise { - await this.addPetRaw(requestParameters); + async addPet(requestParameters: AddPetRequest, initOverrides?: RequestInit): Promise { + await this.addPetRaw(requestParameters, initOverrides); } /** * Deletes a pet */ - async deletePetRaw(requestParameters: DeletePetRequest): Promise> { + async deletePetRaw(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.'); } @@ -124,7 +124,7 @@ export class PetApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -132,15 +132,15 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(requestParameters: DeletePetRequest): Promise { - await this.deletePetRaw(requestParameters); + async deletePet(requestParameters: DeletePetRequest, initOverrides?: RequestInit): Promise { + await this.deletePetRaw(requestParameters, initOverrides); } /** * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise>> { + async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.status === null || requestParameters.status === undefined) { throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.'); } @@ -163,7 +163,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -172,8 +172,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple status values can be provided with comma separated strings * Finds Pets by status */ - async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise> { - const response = await this.findPetsByStatusRaw(requestParameters); + async findPetsByStatus(requestParameters: FindPetsByStatusRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByStatusRaw(requestParameters, initOverrides); return await response.value(); } @@ -181,7 +181,7 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise>> { + async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise>> { if (requestParameters.tags === null || requestParameters.tags === undefined) { throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.'); } @@ -204,7 +204,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -213,8 +213,8 @@ export class PetApi extends runtime.BaseAPI { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * Finds Pets by tags */ - async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise> { - const response = await this.findPetsByTagsRaw(requestParameters); + async findPetsByTags(requestParameters: FindPetsByTagsRequest, initOverrides?: RequestInit): Promise> { + const response = await this.findPetsByTagsRaw(requestParameters, initOverrides); return await response.value(); } @@ -222,7 +222,7 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise> { + async getPetByIdRaw(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.'); } @@ -240,7 +240,7 @@ export class PetApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -249,15 +249,15 @@ export class PetApi extends runtime.BaseAPI { * Returns a single pet * Find pet by ID */ - async getPetById(requestParameters: GetPetByIdRequest): Promise { - const response = await this.getPetByIdRaw(requestParameters); + async getPetById(requestParameters: GetPetByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getPetByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Update an existing pet */ - async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { + async updatePetRaw(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } @@ -279,7 +279,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -287,14 +287,14 @@ export class PetApi extends runtime.BaseAPI { /** * Update an existing pet */ - async updatePet(requestParameters: UpdatePetRequest): Promise { - await this.updatePetRaw(requestParameters); + async updatePet(requestParameters: UpdatePetRequest, initOverrides?: RequestInit): Promise { + await this.updatePetRaw(requestParameters, initOverrides); } /** * Updates a pet in the store with form data */ - async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise> { + async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.'); } @@ -336,7 +336,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -344,14 +344,14 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise { - await this.updatePetWithFormRaw(requestParameters); + async updatePetWithForm(requestParameters: UpdatePetWithFormRequest, initOverrides?: RequestInit): Promise { + await this.updatePetWithFormRaw(requestParameters, initOverrides); } /** * uploads an image */ - async uploadFileRaw(requestParameters: UploadFileRequest): Promise> { + async uploadFileRaw(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.petId === null || requestParameters.petId === undefined) { throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.'); } @@ -395,7 +395,7 @@ export class PetApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: formParams, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -403,8 +403,8 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(requestParameters: UploadFileRequest): Promise { - const response = await this.uploadFileRaw(requestParameters); + async uploadFile(requestParameters: UploadFileRequest, initOverrides?: RequestInit): Promise { + const response = await this.uploadFileRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts index 206cebc42a4..537d5fb8f85 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts @@ -39,7 +39,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise> { + async deleteOrderRaw(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.'); } @@ -53,7 +53,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -62,15 +62,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * Delete purchase order by ID */ - async deleteOrder(requestParameters: DeleteOrderRequest): Promise { - await this.deleteOrderRaw(requestParameters); + async deleteOrder(requestParameters: DeleteOrderRequest, initOverrides?: RequestInit): Promise { + await this.deleteOrderRaw(requestParameters, initOverrides); } /** * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventoryRaw(): Promise> { + async getInventoryRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -84,7 +84,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -93,8 +93,8 @@ export class StoreApi extends runtime.BaseAPI { * Returns a map of status codes to quantities * Returns pet inventories by status */ - async getInventory(): Promise<{ [key: string]: number; }> { - const response = await this.getInventoryRaw(); + async getInventory(initOverrides?: RequestInit): Promise<{ [key: string]: number; }> { + const response = await this.getInventoryRaw(initOverrides); return await response.value(); } @@ -102,7 +102,7 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise> { + async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.orderId === null || requestParameters.orderId === undefined) { throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.'); } @@ -116,7 +116,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -125,15 +125,15 @@ export class StoreApi extends runtime.BaseAPI { * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * Find purchase order by ID */ - async getOrderById(requestParameters: GetOrderByIdRequest): Promise { - const response = await this.getOrderByIdRaw(requestParameters); + async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit): Promise { + const response = await this.getOrderByIdRaw(requestParameters, initOverrides); return await response.value(); } /** * Place an order for a pet */ - async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { + async placeOrderRaw(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -158,8 +158,8 @@ export class StoreApi extends runtime.BaseAPI { /** * Place an order for a pet */ - async placeOrder(requestParameters: PlaceOrderRequest): Promise { - const response = await this.placeOrderRaw(requestParameters); + async placeOrder(requestParameters: PlaceOrderRequest, initOverrides?: RequestInit): Promise { + const response = await this.placeOrderRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts index a0c7433ad66..bc32124c191 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts @@ -57,7 +57,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUserRaw(requestParameters: CreateUserRequest): Promise> { + async createUserRaw(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -83,14 +83,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Create user */ - async createUser(requestParameters: CreateUserRequest): Promise { - await this.createUserRaw(requestParameters); + async createUser(requestParameters: CreateUserRequest, initOverrides?: RequestInit): Promise { + await this.createUserRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { + async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -115,14 +115,14 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise { - await this.createUsersWithArrayInputRaw(requestParameters); + async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithArrayInputRaw(requestParameters, initOverrides); } /** * Creates list of users with given input array */ - async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { + async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.body === null || requestParameters.body === undefined) { throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -147,15 +147,15 @@ export class UserApi extends runtime.BaseAPI { /** * Creates list of users with given input array */ - async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise { - await this.createUsersWithListInputRaw(requestParameters); + async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest, initOverrides?: RequestInit): Promise { + await this.createUsersWithListInputRaw(requestParameters, initOverrides); } /** * This can only be done by the logged in user. * Delete user */ - async deleteUserRaw(requestParameters: DeleteUserRequest): Promise> { + async deleteUserRaw(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.'); } @@ -169,7 +169,7 @@ export class UserApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -178,14 +178,14 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Delete user */ - async deleteUser(requestParameters: DeleteUserRequest): Promise { - await this.deleteUserRaw(requestParameters); + async deleteUser(requestParameters: DeleteUserRequest, initOverrides?: RequestInit): Promise { + await this.deleteUserRaw(requestParameters, initOverrides); } /** * Get user by user name */ - async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise> { + async getUserByNameRaw(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.'); } @@ -199,7 +199,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.JSONApiResponse(response); } @@ -207,15 +207,15 @@ export class UserApi extends runtime.BaseAPI { /** * Get user by user name */ - async getUserByName(requestParameters: GetUserByNameRequest): Promise { - const response = await this.getUserByNameRaw(requestParameters); + async getUserByName(requestParameters: GetUserByNameRequest, initOverrides?: RequestInit): Promise { + const response = await this.getUserByNameRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs user into the system */ - async loginUserRaw(requestParameters: LoginUserRequest): Promise> { + async loginUserRaw(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.'); } @@ -241,7 +241,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.TextApiResponse(response) as any; } @@ -249,15 +249,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(requestParameters: LoginUserRequest): Promise { - const response = await this.loginUserRaw(requestParameters); + async loginUser(requestParameters: LoginUserRequest, initOverrides?: RequestInit): Promise { + const response = await this.loginUserRaw(requestParameters, initOverrides); return await response.value(); } /** * Logs out current logged in user session */ - async logoutUserRaw(): Promise> { + async logoutUserRaw(initOverrides?: RequestInit): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -267,7 +267,7 @@ export class UserApi extends runtime.BaseAPI { method: 'GET', headers: headerParameters, query: queryParameters, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -275,15 +275,15 @@ export class UserApi extends runtime.BaseAPI { /** * Logs out current logged in user session */ - async logoutUser(): Promise { - await this.logoutUserRaw(); + async logoutUser(initOverrides?: RequestInit): Promise { + await this.logoutUserRaw(initOverrides); } /** * This can only be done by the logged in user. * Updated user */ - async updateUserRaw(requestParameters: UpdateUserRequest): Promise> { + async updateUserRaw(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise> { if (requestParameters.username === null || requestParameters.username === undefined) { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, body: requestParameters.body, - }); + }, initOverrides); return new runtime.VoidApiResponse(response); } @@ -313,8 +313,8 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(requestParameters: UpdateUserRequest): Promise { - await this.updateUserRaw(requestParameters); + async updateUser(requestParameters: UpdateUserRequest, initOverrides?: RequestInit): Promise { + await this.updateUserRaw(requestParameters, initOverrides); } } diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts index 164ebaaaea8..acfcb283280 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts @@ -44,8 +44,8 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } - protected async request(context: RequestOpts): Promise { - const { url, init } = this.createFetchParams(context); + protected async request(context: RequestOpts, initOverrides?: RequestInit): Promise { + const { url, init } = this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); if (response.status >= 200 && response.status < 300) { return response; @@ -53,7 +53,7 @@ export class BaseAPI { throw response; } - private createFetchParams(context: RequestOpts) { + private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) { let url = this.configuration.basePath + context.path; if (context.query !== undefined && Object.keys(context.query).length !== 0) { // only add the querystring to the URL if there are query parameters. @@ -70,7 +70,8 @@ export class BaseAPI { method: context.method, headers: headers, body, - credentials: this.configuration.credentials + credentials: this.configuration.credentials, + ...initOverrides }; return { url, init }; } From e2ff39d3e3501977d01f8dcf13fbae2a0337b0eb Mon Sep 17 00:00:00 2001 From: ota42y Date: Fri, 6 Aug 2021 16:22:24 +0900 Subject: [PATCH 36/72] [TypeScript-fetch] disable lint in index file (#9675) * [TS] disable lint in index file We disable lint in typescript-fetch in this PR https://github.com/OpenAPITools/openapi-generator/pull/4110 But we doesn't disable index.ts files so we'll get error with [no-cycle](https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-cycle.md) rule. - index.ts [import all classFiles](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache#L4) to exporting - When model use another models (i.e. article model have user model as author), model import another model [using index.ts](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache#L10) So we need disable all generated file. * generate files Co-authored-by: Esteban Gehring --- .../src/main/resources/typescript-fetch/apis.index.mustache | 2 ++ .../src/main/resources/typescript-fetch/index.mustache | 2 ++ .../src/main/resources/typescript-fetch/models.index.mustache | 2 ++ .../petstore/typescript-fetch/builds/default-v3.0/apis/index.ts | 2 ++ .../petstore/typescript-fetch/builds/default-v3.0/index.ts | 2 ++ .../typescript-fetch/builds/default-v3.0/models/index.ts | 2 ++ .../petstore/typescript-fetch/builds/default/apis/index.ts | 2 ++ .../client/petstore/typescript-fetch/builds/default/index.ts | 2 ++ .../petstore/typescript-fetch/builds/default/models/index.ts | 2 ++ .../client/petstore/typescript-fetch/builds/enum/apis/index.ts | 2 ++ samples/client/petstore/typescript-fetch/builds/enum/index.ts | 2 ++ .../petstore/typescript-fetch/builds/enum/models/index.ts | 2 ++ .../typescript-fetch/builds/es6-target/src/apis/index.ts | 2 ++ .../petstore/typescript-fetch/builds/es6-target/src/index.ts | 2 ++ .../typescript-fetch/builds/es6-target/src/models/index.ts | 2 ++ .../typescript-fetch/builds/multiple-parameters/apis/index.ts | 2 ++ .../typescript-fetch/builds/multiple-parameters/index.ts | 2 ++ .../typescript-fetch/builds/multiple-parameters/models/index.ts | 2 ++ .../builds/prefix-parameter-interfaces/src/apis/index.ts | 2 ++ .../builds/prefix-parameter-interfaces/src/index.ts | 2 ++ .../builds/prefix-parameter-interfaces/src/models/index.ts | 2 ++ .../builds/typescript-three-plus/src/apis/index.ts | 2 ++ .../typescript-fetch/builds/typescript-three-plus/src/index.ts | 2 ++ .../builds/typescript-three-plus/src/models/index.ts | 2 ++ .../typescript-fetch/builds/with-interfaces/apis/index.ts | 2 ++ .../petstore/typescript-fetch/builds/with-interfaces/index.ts | 2 ++ .../typescript-fetch/builds/with-interfaces/models/index.ts | 2 ++ .../typescript-fetch/builds/with-npm-version/src/apis/index.ts | 2 ++ .../typescript-fetch/builds/with-npm-version/src/index.ts | 2 ++ .../builds/with-npm-version/src/models/index.ts | 2 ++ .../builds/without-runtime-checks/src/apis/index.ts | 2 ++ .../typescript-fetch/builds/without-runtime-checks/src/index.ts | 2 ++ .../builds/without-runtime-checks/src/models/index.ts | 2 ++ 33 files changed, 66 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.index.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.index.mustache index 44f8c989936..71e043b46e1 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.index.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.index.mustache @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ {{#useSagaAndRecords}} export * from './SagaApiManager' export * from './allSagas' diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache index ede27a38747..3ae5805318a 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; {{#useSagaAndRecords}} export * from './runtimeSagasAndRecords'; diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache index 1be5a347b38..1b7e2dd668d 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ {{#models}} {{#model}} {{^withoutRuntimeChecks}} diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/index.ts index 2190a2df6d9..973034df93f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './AnotherFakeApi'; export * from './DefaultApi'; export * from './FakeApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/index.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts index 51da7654785..b2f6e6f9b34 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './AdditionalPropertiesClass'; export * from './Animal'; export * from './ArrayOfArrayOfNumberOnly'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/index.ts b/samples/client/petstore/typescript-fetch/builds/default/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/index.ts index a1aa4698ff2..69c44c00fa0 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/index.ts @@ -1 +1,3 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './DefaultApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/enum/index.ts b/samples/client/petstore/typescript-fetch/builds/enum/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts index 9772c0c8522..ee4474785e1 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './EnumPatternObject'; export * from './InlineObject'; export * from './InlineResponse200'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts index b07ddc8446a..9e4859f3b39 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './Category'; export * from './ModelApiResponse'; export * from './Order'; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/index.ts index 056206bfaca..3b870e5c4aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './PetApi'; export * from './StoreApi'; export * from './UserApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/index.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/index.ts index 848ecfa4d10..be9d1edeefe 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './apis'; export * from './models'; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/models/index.ts index 099f52268b7..8d8f621b1ba 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ /** * A category for a pet * @export From 39901c824f881510a0b3f6443f283f18047282d2 Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Fri, 6 Aug 2021 02:25:10 -0500 Subject: [PATCH 37/72] [typescript-inversify] fix: Sets `IsCollectionFormatMulti` to true on multi file uploads (#9796) --- .../codegen/languages/TypeScriptInversifyClientCodegen.java | 3 +++ 1 file changed, 3 insertions(+) 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 6de4f086413..b4b05924917 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 @@ -188,6 +188,9 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo public void postProcessParameter(CodegenParameter parameter) { super.postProcessParameter(parameter); parameter.dataType = applyLocalTypeMapping(parameter.dataType); + if (parameter.isFormParam && parameter.isArray && "binary".equals(parameter.dataFormat)) { + parameter.isCollectionFormatMulti = true; + } } @Override From 6d8791c3da95789c7aedaeb53dfecf93ef68cbbe Mon Sep 17 00:00:00 2001 From: Richard Willis Date: Fri, 6 Aug 2021 09:21:05 +0100 Subject: [PATCH 38/72] [typescript-fetch] Fix double comma arguments due to initOverrides. Refs #10050 (#10101) --- .../main/resources/typescript-fetch/apis.mustache | 4 ++-- .../builds/multiple-parameters/apis/PetApi.ts | 6 +++--- .../builds/multiple-parameters/apis/UserApi.ts | 4 ++-- .../builds/sagas-and-records/src/apis/PetApi.ts | 6 +++--- .../sagas-and-records/src/apis/PetPartApi.ts | 2 +- .../builds/sagas-and-records/src/apis/UserApi.ts | 4 ++-- .../builds/sagas-and-records/src/apis/index.ts | 2 ++ .../builds/sagas-and-records/src/index.ts | 2 ++ .../builds/sagas-and-records/src/models/index.ts | 2 ++ .../builds/with-npm-version/package-lock.json | 14 ++++++++++++++ 10 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index f9dfb7c77e2..ef0e8cbedc6 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -60,7 +60,7 @@ export interface {{classname}}Interface { {{/summary}} */ {{^useSingleRequestParameter}} - {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; + {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; {{/useSingleRequestParameter}} {{#useSingleRequestParameter}} {{nickname}}({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>; @@ -331,7 +331,7 @@ export class {{classname}} extends runtime.BaseAPI { {{/summary}} */ {{^useSingleRequestParameter}} - async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^-last}}, {{/-last}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { + async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}initOverrides?: RequestInit): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> { {{#returnType}} const response = await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}} }, {{/allParams.0}}initOverrides); return await response.value(); diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts index 15a4a866e5b..60f5804b68d 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts @@ -136,7 +136,7 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(petId: number, , apiKey?: string, initOverrides?: RequestInit): Promise { + async deletePet(petId: number, apiKey?: string, initOverrides?: RequestInit): Promise { await this.deletePetRaw({ petId: petId, apiKey: apiKey }, initOverrides); } @@ -348,7 +348,7 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(petId: number, , name?: string, , status?: string, initOverrides?: RequestInit): Promise { + async updatePetWithForm(petId: number, name?: string, status?: string, initOverrides?: RequestInit): Promise { await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }, initOverrides); } @@ -407,7 +407,7 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(petId: number, , additionalMetadata?: string, , file?: Blob, initOverrides?: RequestInit): Promise { + async uploadFile(petId: number, additionalMetadata?: string, file?: Blob, initOverrides?: RequestInit): Promise { const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts index cc66bd9b1af..a9bb0facaf2 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts @@ -251,7 +251,7 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(username: string, , password: string, initOverrides?: RequestInit): Promise { + async loginUser(username: string, password: string, initOverrides?: RequestInit): Promise { const response = await this.loginUserRaw({ username: username, password: password }, initOverrides); return await response.value(); } @@ -315,7 +315,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(username: string, , body: User, initOverrides?: RequestInit): Promise { + async updateUser(username: string, body: User, initOverrides?: RequestInit): Promise { await this.updateUserRaw({ username: username, body: body }, initOverrides); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts index 262aaaa131f..fa782af9b14 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts @@ -153,7 +153,7 @@ export class PetApi extends runtime.BaseAPI { /** * Deletes a pet */ - async deletePet(petId: number, , apiKey?: string, initOverrides?: RequestInit): Promise { + async deletePet(petId: number, apiKey?: string, initOverrides?: RequestInit): Promise { await this.deletePetRaw({ petId: petId, apiKey: apiKey }, initOverrides); } @@ -447,7 +447,7 @@ export class PetApi extends runtime.BaseAPI { /** * Updates a pet in the store with form data */ - async updatePetWithForm(petId: number, , name?: string, , status?: string, initOverrides?: RequestInit): Promise { + async updatePetWithForm(petId: number, name?: string, status?: string, initOverrides?: RequestInit): Promise { await this.updatePetWithFormRaw({ petId: petId, name: name, status: status }, initOverrides); } @@ -506,7 +506,7 @@ export class PetApi extends runtime.BaseAPI { /** * uploads an image */ - async uploadFile(petId: number, , additionalMetadata?: string, , file?: Blob, initOverrides?: RequestInit): Promise { + async uploadFile(petId: number, additionalMetadata?: string, file?: Blob, initOverrides?: RequestInit): Promise { const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts index 1586d3f0a9d..887bc3d5eba 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts @@ -128,7 +128,7 @@ export class PetPartApi extends runtime.BaseAPI { /** * Get the matching parts for the given pet part. */ - async getMatchingParts(fakePetPartId: number, , _long: boolean, , smooth: boolean, , _short: boolean, , name?: string, , connectedPart?: string, initOverrides?: RequestInit): Promise { + async getMatchingParts(fakePetPartId: number, _long: boolean, smooth: boolean, _short: boolean, name?: string, connectedPart?: string, initOverrides?: RequestInit): Promise { const response = await this.getMatchingPartsRaw({ fakePetPartId: fakePetPartId, _long: _long, smooth: smooth, _short: _short, name: name, connectedPart: connectedPart }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts index a55f4cf736a..46b07183de4 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts @@ -254,7 +254,7 @@ export class UserApi extends runtime.BaseAPI { /** * Logs user into the system */ - async loginUser(username: string, , password: string, initOverrides?: RequestInit): Promise { + async loginUser(username: string, password: string, initOverrides?: RequestInit): Promise { const response = await this.loginUserRaw({ username: username, password: password }, initOverrides); return await response.value(); } @@ -318,7 +318,7 @@ export class UserApi extends runtime.BaseAPI { * This can only be done by the logged in user. * Updated user */ - async updateUser(username: string, , body: User, initOverrides?: RequestInit): Promise { + async updateUser(username: string, body: User, initOverrides?: RequestInit): Promise { const response = await this.updateUserRaw({ username: username, body: body }, initOverrides); return await response.value(); } diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/index.ts index 4a025f4ed41..4b267cb8ef6 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './SagaApiManager' export * from './allSagas' export * from './BehaviorApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/index.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/index.ts index abbe33d5b20..9b073812466 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './runtime'; export * from './runtimeSagasAndRecords'; export * from './ApiEntitiesRecord'; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/index.ts index 6881bb9feda..b4f59662cbc 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/index.ts @@ -1,3 +1,5 @@ +/* tslint:disable */ +/* eslint-disable */ export * from './BehaviorType'; export * from './Category'; export * from './CategoryRecord'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json new file mode 100644 index 00000000000..ff53e4530f7 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json @@ -0,0 +1,14 @@ +{ + "name": "@openapitools/typescript-fetch-petstore", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "dev": true + } + } +} From fe63b0e28ee927513d71fcd0ffe6db11874d21d7 Mon Sep 17 00:00:00 2001 From: ND Tai <49815011+ndtai772@users.noreply.github.com> Date: Sat, 7 Aug 2021 19:53:27 +0700 Subject: [PATCH 39/72] Fix typo on rust client (#10096) --- .../src/main/resources/rust/reqwest/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache index 6dd9d1e3823..3bf87eff935 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache @@ -212,7 +212,7 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(local_var_param_value) => { form = form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, + Some(local_var_param_value) => { local_var_form = local_var_form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { local_var_form = local_var_form.text("{{{baseName}}}", ""); }, } {{/isNullable}} From ac1ef4bdeb7df5a95112911c82e27cb372251893 Mon Sep 17 00:00:00 2001 From: Timothy Langer Date: Sat, 7 Aug 2021 13:57:43 +0100 Subject: [PATCH 40/72] Fix typo (preffer -> prefer) (#10098) --- docs/customization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customization.md b/docs/customization.md index 23704452f60..6daf72e2130 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -339,7 +339,7 @@ Your config file for Java can look like } ``` -Or if you preffer yaml format it can look like +Or if you prefer yaml format it can look like ```yaml groupId: "com.my.company" From 09a4da0970f2215110b66d337080899f325e7912 Mon Sep 17 00:00:00 2001 From: James Gilliland Date: Sat, 7 Aug 2021 08:02:40 -0500 Subject: [PATCH 41/72] Make php's array a primitive (#10093) Fixes a bug where code generation would sometimes treat arrays as objects and break serialization and code documentation. --- docs/generators/php-laravel.md | 1 + docs/generators/php-lumen.md | 1 + docs/generators/php-mezzio-ph.md | 1 + docs/generators/php-slim-deprecated.md | 1 + docs/generators/php-slim4.md | 1 + docs/generators/php.md | 1 + .../codegen/languages/AbstractPhpCodegen.java | 1 + .../codegen/php/AbstractPhpCodegenTest.java | 24 +++++++++ .../src/test/resources/3_0/issue_8945.yaml | 50 +++++++++++++++++++ .../docs/Model/AdditionalPropertiesClass.md | 2 +- .../docs/Model/ArrayOfArrayOfNumberOnly.md | 2 +- .../OpenAPIClient-php/docs/Model/ArrayTest.md | 4 +- .../OpenAPIClient-php/docs/Model/MapTest.md | 2 +- .../lib/ObjectSerializer.php | 4 +- 14 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/issue_8945.yaml diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md index 9c8665cc52e..b28504c1d02 100644 --- a/docs/generators/php-laravel.md +++ b/docs/generators/php-laravel.md @@ -40,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
            • DateTime
              • +
            • array
            • bool
            • boolean
            • byte
              • diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md index 9242d70ae45..28f4810873d 100644 --- a/docs/generators/php-lumen.md +++ b/docs/generators/php-lumen.md @@ -40,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
              • DateTime
                • +
              • array
              • bool
              • boolean
              • byte
                • diff --git a/docs/generators/php-mezzio-ph.md b/docs/generators/php-mezzio-ph.md index 93f31d7fbca..8460e439084 100644 --- a/docs/generators/php-mezzio-ph.md +++ b/docs/generators/php-mezzio-ph.md @@ -41,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
                • DateTime
                  • +
                • array
                • bool
                • boolean
                • byte
                  • diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md index 016ccd242e2..838b14ab7c3 100644 --- a/docs/generators/php-slim-deprecated.md +++ b/docs/generators/php-slim-deprecated.md @@ -40,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
                  • DateTime
                    • +
                  • array
                  • bool
                  • boolean
                  • byte
                    • diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md index cadaf51e5ff..5e0ec649254 100644 --- a/docs/generators/php-slim4.md +++ b/docs/generators/php-slim4.md @@ -41,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
                    • DateTime
                      • +
                    • array
                    • bool
                    • boolean
                    • byte
                      • diff --git a/docs/generators/php.md b/docs/generators/php.md index ab4045d604d..8a99d592df2 100644 --- a/docs/generators/php.md +++ b/docs/generators/php.md @@ -41,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
                      • DateTime
                        • +
                      • array
                      • bool
                      • boolean
                      • byte
                        • 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 d8327a99401..779393af403 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 @@ -89,6 +89,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg "float", "string", "object", + "array", "DateTime", "mixed", "number", diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java index 22ecaeb2108..667e91df22e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java @@ -17,10 +17,16 @@ package org.openapitools.codegen.php; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.media.Schema; + import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenOperation; +import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractPhpCodegen; +import org.openapitools.codegen.TestUtils; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -122,6 +128,24 @@ public class AbstractPhpCodegenTest { }; } + @Test(description = "Issue #8945") + public void testArrayOfArrays() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8945.yaml"); + final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); + + Schema test1 = openAPI.getComponents().getSchemas().get("MyResponse"); + CodegenModel cm1 = codegen.fromModel("MyResponse", test1); + + // Make sure we got the container object. + Assert.assertEquals(cm1.getDataType(), "object"); + Assert.assertEquals(codegen.getTypeDeclaration("MyResponse"), "\\php\\Model\\MyResponse"); + + // Assert the array type is properly detected. + CodegenProperty cp1 = cm1.vars.get(0); + cp1 = codegen.fromProperty("ArrayProp", test1); + Assert.assertTrue(cp1.isPrimitiveType); + } + private static class P_AbstractPhpCodegen extends AbstractPhpCodegen { @Override public CodegenType getTag() { diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_8945.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_8945.yaml new file mode 100644 index 00000000000..efe6b6d35dd --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/issue_8945.yaml @@ -0,0 +1,50 @@ +openapi: 3.0.1 +info: + title: OpenAPI Petstore + description: "for schemas with properties and required ensure correct hasVars, hasRequired, vars, and requiredVars" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.0 +servers: + - url: http://petstore.swagger.io:80/v2 +tags: [] +paths: + /sut: + get: + operationId: getArrayOfArrays + responses: + '200': + description: OK + schema: + $ref: '#/definitions/MyResponse' +components: + schemas: + MyResponse: + type: object + properties: + ArrayOfArrays: + type: array + items: + $ref: '#/components/schemas/ArrayProp' + ArrayOfObjects: + type: array + items: + $ref: '#/components/schemas/ObjectProp' + ArrayOfArrays: + type: array + items: + $ref: '#/components/schemas/ArrayProp' + ArrayOfObjects: + type: array + items: + $ref: '#/components/schemas/ObjectProp' + ArrayProp: + type: array + items: + type: string + ObjectProp: + type: object + properties: + name: + type: string diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md index 577d4a425b9..bcb26421855 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md @@ -5,6 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **map_property** | **array** | | [optional] -**map_of_map_property** | [**array>**](array.md) | | [optional] +**map_of_map_property** | **array>** | | [optional] [[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md index d035d7a4707..45f7d3b8615 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md @@ -4,6 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**array_array_number** | [**float[][]**](array.md) | | [optional] +**array_array_number** | **float[][]** | | [optional] [[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md index 18424410532..8f260b7c9b5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **array_of_string** | **string[]** | | [optional] -**array_array_of_integer** | [**int[][]**](array.md) | | [optional] -**array_array_of_model** | [**\OpenAPI\Client\Model\ReadOnlyFirst[][]**](array.md) | | [optional] +**array_array_of_integer** | **int[][]** | | [optional] +**array_array_of_model** | **\OpenAPI\Client\Model\ReadOnlyFirst[][]** | | [optional] [[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md index 7bb07e8451e..10509cbb6ec 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**map_map_of_string** | [**array>**](array.md) | | [optional] +**map_map_of_string** | **array>** | | [optional] **map_of_enum_string** | **array** | | [optional] **direct_map** | **array** | | [optional] **indirect_map** | **array** | | [optional] diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index c8be21f6cc2..bd876d0c289 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -86,7 +86,7 @@ class ObjectSerializer foreach ($data::openAPITypes() as $property => $openAPIType) { $getter = $data::getters()[$property]; $value = $data->$getter(); - if ($value !== null && !in_array($openAPIType, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { + if ($value !== null && !in_array($openAPIType, ['DateTime', 'array', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { $callable = [$openAPIType, 'getAllowableEnumValues']; if (is_callable($callable)) { /** array $callable */ @@ -330,7 +330,7 @@ class ObjectSerializer } /** @psalm-suppress ParadoxicalCondition */ - if (in_array($class, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { + if (in_array($class, ['DateTime', 'array', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { settype($data, $class); return $data; } From 189b44b1913346d4bd22f736f677883c29f0284d Mon Sep 17 00:00:00 2001 From: Yorick Holkamp Date: Sat, 7 Aug 2021 15:11:03 +0200 Subject: [PATCH 42/72] [dart2] Include request body on DELETE call (#10100) * Include request body on DELETE call This change updates the generated `ApiClient` to include the request body on DELETE calls. [Per the RFC on page 2][1], DELETE calls are allowed to have a request body, even though the behavior may be undefined. I've not come across many APIs that use this behavior but there are a few, in particular the [Ory Kratos API][2] does so, not forwarding the body prevents such an API from being used. An API spec that does not define a request body should continue to function as expected. [1] https://datatracker.ietf.org/doc/html/rfc7231#section-4.3.5 [2] https://www.ory.sh/kratos/docs/reference/api/#operation/submitSelfServiceLogoutFlowWithoutBrowser * Samples generated with dart2 template change --- .../src/main/resources/dart2/api_client.mustache | 2 +- .../petstore/dart2/petstore_client_lib/lib/api_client.dart | 2 +- .../petstore/dart2/petstore_client_lib_fake/lib/api_client.dart | 2 +- .../lib/api_client.dart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache index d7f90713d5f..822fe2912c8 100644 --- a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache @@ -127,7 +127,7 @@ class ApiClient { switch(method) { case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,); - case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,); + case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,); diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart index 37b6acfd4c6..8833c281a29 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart @@ -120,7 +120,7 @@ class ApiClient { switch(method) { case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,); - case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,); + case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,); diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart index b64c73d9772..48ed9288e65 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart @@ -123,7 +123,7 @@ class ApiClient { switch(method) { case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,); - case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,); + case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,); diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart index 02f98fe17a4..8a3db870eca 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart +++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart @@ -123,7 +123,7 @@ class ApiClient { switch(method) { case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,); - case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,); + case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,); From 11d29eb22b1e3ce75c6969adf32e565a259114f6 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Sat, 7 Aug 2021 21:29:14 +0800 Subject: [PATCH 43/72] [go-server] Feat: add required assertions to models (#10068) * Add RequiredError * Add IsZeroValue helper * Add AssertRequired method to all models * Add AssertRequired call for body param * Regenerate files * Add DisallowUnknownFields * Regenerate samples * Use hasRequired in model to remove unnecessary code * Revert disallowUnknownFields * Use isAdditionalPropertiesTrue for disallowing unknown fields * Updated samples * Fix indent * Add require checks for nested slices * Add new tests * Regenerate samples * Regenerate samples after merging --- bin/configs/go-server-required.yaml | 9 + .../go-server/controller-api.mustache | 28 +- .../main/resources/go-server/error.mustache | 19 + .../main/resources/go-server/helpers.mustache | 40 +- .../main/resources/go-server/model.mustache | 99 +- .../test/resources/3_0/server-required.yaml | 800 ++++++++++++++++ .../petstore/go-api-server/go/api_pet.go | 24 +- .../petstore/go-api-server/go/api_store.go | 12 +- .../petstore/go-api-server/go/api_user.go | 52 +- .../server/petstore/go-api-server/go/error.go | 19 + .../petstore/go-api-server/go/helpers.go | 40 +- .../go-api-server/go/model_api_response.go | 17 + .../go-api-server/go/model_category.go | 17 + .../petstore/go-api-server/go/model_order.go | 17 + .../petstore/go-api-server/go/model_pet.go | 35 + .../petstore/go-api-server/go/model_tag.go | 17 + .../petstore/go-api-server/go/model_user.go | 17 + .../petstore/go-chi-server/go/api_pet.go | 24 +- .../petstore/go-chi-server/go/api_store.go | 12 +- .../petstore/go-chi-server/go/api_user.go | 52 +- .../server/petstore/go-chi-server/go/error.go | 19 + .../petstore/go-chi-server/go/helpers.go | 40 +- .../go-chi-server/go/model_api_response.go | 17 + .../go-chi-server/go/model_category.go | 17 + .../petstore/go-chi-server/go/model_order.go | 17 + .../petstore/go-chi-server/go/model_pet.go | 35 + .../petstore/go-chi-server/go/model_tag.go | 17 + .../petstore/go-chi-server/go/model_user.go | 17 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 25 + .../.openapi-generator/VERSION | 1 + .../petstore/go-server-required/Dockerfile | 14 + .../petstore/go-server-required/README.md | 35 + .../go-server-required/api/openapi.yaml | 906 ++++++++++++++++++ .../server/petstore/go-server-required/go.mod | 5 + .../petstore/go-server-required/go/api.go | 100 ++ .../petstore/go-server-required/go/api_pet.go | 275 ++++++ .../go-server-required/go/api_pet_service.go | 142 +++ .../go-server-required/go/api_store.go | 149 +++ .../go/api_store_service.go | 84 ++ .../go-server-required/go/api_user.go | 263 +++++ .../go-server-required/go/api_user_service.go | 131 +++ .../petstore/go-server-required/go/error.go | 62 ++ .../petstore/go-server-required/go/helpers.go | 64 ++ .../petstore/go-server-required/go/impl.go | 17 + .../petstore/go-server-required/go/logger.go | 32 + .../go/model_api_response.go | 37 + .../go-server-required/go/model_category.go | 35 + .../go-server-required/go/model_order.go | 64 ++ .../go-server-required/go/model_order_info.go | 41 + .../go-server-required/go/model_pet.go | 66 ++ .../go/model_special_info.go | 35 + .../go-server-required/go/model_tag.go | 35 + .../go-server-required/go/model_user.go | 68 ++ .../petstore/go-server-required/go/routers.go | 221 +++++ .../petstore/go-server-required/main.go | 34 + 56 files changed, 4441 insertions(+), 52 deletions(-) create mode 100644 bin/configs/go-server-required.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/server-required.yaml create mode 100644 samples/server/petstore/go-server-required/.openapi-generator-ignore create mode 100644 samples/server/petstore/go-server-required/.openapi-generator/FILES create mode 100644 samples/server/petstore/go-server-required/.openapi-generator/VERSION create mode 100644 samples/server/petstore/go-server-required/Dockerfile create mode 100644 samples/server/petstore/go-server-required/README.md create mode 100644 samples/server/petstore/go-server-required/api/openapi.yaml create mode 100644 samples/server/petstore/go-server-required/go.mod create mode 100644 samples/server/petstore/go-server-required/go/api.go create mode 100644 samples/server/petstore/go-server-required/go/api_pet.go create mode 100644 samples/server/petstore/go-server-required/go/api_pet_service.go create mode 100644 samples/server/petstore/go-server-required/go/api_store.go create mode 100644 samples/server/petstore/go-server-required/go/api_store_service.go create mode 100644 samples/server/petstore/go-server-required/go/api_user.go create mode 100644 samples/server/petstore/go-server-required/go/api_user_service.go create mode 100644 samples/server/petstore/go-server-required/go/error.go create mode 100644 samples/server/petstore/go-server-required/go/helpers.go create mode 100644 samples/server/petstore/go-server-required/go/impl.go create mode 100644 samples/server/petstore/go-server-required/go/logger.go create mode 100644 samples/server/petstore/go-server-required/go/model_api_response.go create mode 100644 samples/server/petstore/go-server-required/go/model_category.go create mode 100644 samples/server/petstore/go-server-required/go/model_order.go create mode 100644 samples/server/petstore/go-server-required/go/model_order_info.go create mode 100644 samples/server/petstore/go-server-required/go/model_pet.go create mode 100644 samples/server/petstore/go-server-required/go/model_special_info.go create mode 100644 samples/server/petstore/go-server-required/go/model_tag.go create mode 100644 samples/server/petstore/go-server-required/go/model_user.go create mode 100644 samples/server/petstore/go-server-required/go/routers.go create mode 100644 samples/server/petstore/go-server-required/main.go diff --git a/bin/configs/go-server-required.yaml b/bin/configs/go-server-required.yaml new file mode 100644 index 00000000000..fd90bbbeb83 --- /dev/null +++ b/bin/configs/go-server-required.yaml @@ -0,0 +1,9 @@ +generatorName: go-server +outputDir: samples/server/petstore/go-server-required +inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml +templateDir: modules/openapi-generator/src/main/resources/go-server +additionalProperties: + hideGenerationTimestamp: "true" + packageName: petstoreserver + addResponseHeaders: true + router: "chi" diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache index 2bfa53cd503..68ed2514200 100644 --- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache @@ -174,14 +174,36 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{paramName}} := r.Header.Get("{{baseName}}") {{/isHeaderParam}} {{#isBodyParam}} - {{paramName}} := &{{dataType}}{} - if err := json.NewDecoder(r.Body).Decode(&{{paramName}}); err != nil { + {{paramName}} := {{dataType}}{} + d := json.NewDecoder(r.Body) + {{^isAdditionalPropertiesTrue}} + d.DisallowUnknownFields() + {{/isAdditionalPropertiesTrue}} + if err := d.Decode(&{{paramName}}); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } + {{#isArray}} + {{#items.isModel}} + for _, el := range {{paramName}} { + if err := Assert{{baseType}}Required(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + {{/items.isModel}} + {{/isArray}} + {{^isArray}} + {{#isModel}} + if err := Assert{{baseType}}Required({{paramName}}); err != nil { + c.errorHandler(w, r, err, nil) + return + } + {{/isModel}} + {{/isArray}} {{/isBodyParam}} {{/allParams}} - result, err := c.service.{{nickname}}(r.Context(){{#allParams}}, {{#isBodyParam}}*{{/isBodyParam}}{{paramName}}{{/allParams}}) + result, err := c.service.{{nickname}}(r.Context(){{#allParams}}, {{paramName}}{{/allParams}}) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/modules/openapi-generator/src/main/resources/go-server/error.mustache b/modules/openapi-generator/src/main/resources/go-server/error.mustache index cf22da170fa..a4ffa03f53f 100644 --- a/modules/openapi-generator/src/main/resources/go-server/error.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/error.mustache @@ -2,9 +2,16 @@ package {{packageName}} import ( + "errors" + "fmt" "net/http" ) +var ( + // ErrTypeAssertionError is thrown when type an interface does not match the asserted type + ErrTypeAssertionError = errors.New("unable to assert type") +) + // ParsingError indicates that an error has occurred when parsing request parameters type ParsingError struct { Err error @@ -18,6 +25,15 @@ func (e *ParsingError) Error() string { return e.Err.Error() } +// RequiredError indicates that an error has occurred when parsing request parameters +type RequiredError struct { + Field string +} + +func (e *RequiredError) Error() string { + return fmt.Sprintf("required field '%s' is zero value.", e.Field) +} + // ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if // you would like errors to be handled differently from the DefaultErrorHandler type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) @@ -28,6 +44,9 @@ func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, resu if _, ok := err.(*ParsingError); ok { // Handle parsing errors EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest),{{#addResponseHeaders}} map[string][]string{},{{/addResponseHeaders}} w) + } else if _, ok := err.(*RequiredError); ok { + // Handle missing required errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusUnprocessableEntity),{{#addResponseHeaders}} map[string][]string{},{{/addResponseHeaders}} w) } else { // Handle all other errors EncodeJSONResponse(err.Error(), &result.Code,{{#addResponseHeaders}} result.Headers,{{/addResponseHeaders}} w) diff --git a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache index 13115656bc0..63b91ebb991 100644 --- a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache @@ -1,7 +1,11 @@ {{>partial_header}} package {{packageName}} -//Response return a ImplResponse struct filled +import ( + "reflect" +) + +// Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -13,7 +17,7 @@ func Response(code int, body interface{}) ImplResponse { } {{#addResponseHeaders}} -//ResponseWithHeaders return a ImplResponse struct filled, including headers +// ResponseWithHeaders return a ImplResponse struct filled, including headers func ResponseWithHeaders(code int, headers map[string][]string, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -22,3 +26,35 @@ func ResponseWithHeaders(code int, headers map[string][]string, body interface{} } } {{/addResponseHeaders}} + +// IsZeroValue checks if the val is the zero-ed value. +func IsZeroValue(val interface{}) bool { + return val == nil || reflect.DeepEqual(val, reflect.Zero(reflect.TypeOf(val)).Interface()) +} + +// AssertInterfaceRequired recursively checks each struct in a slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseInterfaceRequired(obj interface{}, callback func(interface{}) error) error { + return AssertRecurseValueRequired(reflect.ValueOf(obj), callback) +} + +// AssertNestedValueRequired checks each struct in the nested slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseValueRequired(value reflect.Value, callback func(interface{}) error) error { + switch value.Kind() { + // If it is a struct we check using callback + case reflect.Struct: + if err := callback(value.Interface()); err != nil { + return err + } + + // If it is a slice we continue recursion + case reflect.Slice: + for i := 0; i < value.Len(); i += 1 { + if err := AssertRecurseValueRequired(value.Index(i), callback); err != nil { + return err + } + } + } + return nil +} diff --git a/modules/openapi-generator/src/main/resources/go-server/model.mustache b/modules/openapi-generator/src/main/resources/go-server/model.mustache index afcfcf7338e..c13d81795ad 100644 --- a/modules/openapi-generator/src/main/resources/go-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/model.mustache @@ -34,4 +34,101 @@ type {{classname}} struct { {{/deprecated}} {{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}` {{/vars}} -}{{/isEnum}}{{/model}}{{/models}} +}{{/isEnum}} + +// Assert{{classname}}Required checks if the required fields are not zero-ed +func Assert{{classname}}Required(obj {{classname}}) error { +{{#hasRequired}} + elements := map[string]interface{}{ +{{#requiredVars}} "{{baseName}}": obj.{{name}}, +{{/requiredVars}} } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + +{{/hasRequired}} +{{#parent}} + {{^isMap}} + {{^isArray}} + if err := Assert{{{parent}}}Required(obj.{{{parent}}}); err != nil { + return err + } + + {{/isArray}} + {{/isMap}} +{{/parent}} +{{#Vars}} + {{#isNullable}} + {{#isModel}} + if obj.{{name}} != nil { + {{/isModel}} + {{#isArray}} + {{#items.isModel}} + if obj.{{name}} != nil { + {{/items.isModel}} + {{^items.isModel}} + {{#mostInnerItems.isModel}} + {{^mostInnerItems.isPrimitiveType}} + if obj.{{name}} != nil { + {{/mostInnerItems.isPrimitiveType}} + {{/mostInnerItems.isModel}} + {{/items.isModel}} + {{/isArray}} + {{/isNullable}} + {{#isModel}} +{{#isNullable}} {{/isNullable}} if err := Assert{{baseType}}Required({{#isNullable}}*{{/isNullable}}obj.{{name}}); err != nil { +{{#isNullable}} {{/isNullable}} return err +{{#isNullable}} {{/isNullable}} } + {{/isModel}} + {{#isArray}} + {{#items.isModel}} +{{#isNullable}} {{/isNullable}} for _, el := range {{#isNullable}}*{{/isNullable}}obj.{{name}} { +{{#isNullable}} {{/isNullable}} if err := Assert{{items.baseType}}Required(el); err != nil { +{{#isNullable}} {{/isNullable}} return err +{{#isNullable}} {{/isNullable}} } +{{#isNullable}} {{/isNullable}} } + {{/items.isModel}} + {{^items.isModel}} + {{#mostInnerItems.isModel}} + {{^mostInnerItems.isPrimitiveType}} +{{#isNullable}} {{/isNullable}} if err := AssertRecurse{{mostInnerItems.dataType}}Required({{#isNullable}}*{{/isNullable}}obj.{{name}}); err != nil { +{{#isNullable}} {{/isNullable}} return err +{{#isNullable}} {{/isNullable}} } + {{/mostInnerItems.isPrimitiveType}} + {{/mostInnerItems.isModel}} + {{/items.isModel}} + {{/isArray}} + {{#isNullable}} + {{#isModel}} + } + {{/isModel}} + {{#isArray}} + {{#items.isModel}} + } + {{/items.isModel}} + {{^items.isModel}} + {{#mostInnerItems.isModel}} + {{^mostInnerItems.isPrimitiveType}} + } + {{/mostInnerItems.isPrimitiveType}} + {{/mostInnerItems.isModel}} + {{/items.isModel}} + {{/isArray}} + {{/isNullable}} +{{/Vars}} + return nil +} + +// AssertRecurse{{classname}}Required recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of {{classname}} (e.g. [][]{{classname}}), otherwise ErrTypeAssertionError is thrown. +func AssertRecurse{{classname}}Required(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + a{{classname}}, ok := obj.({{classname}}) + if !ok { + return ErrTypeAssertionError + } + return Assert{{classname}}Required(a{{classname}}) + }) +}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/test/resources/3_0/server-required.yaml b/modules/openapi-generator/src/test/resources/3_0/server-required.yaml new file mode 100644 index 00000000000..5ced38f18d3 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/server-required.yaml @@ -0,0 +1,800 @@ +openapi: 3.0.0 +servers: + - url: "http://petstore.swagger.io/v2" +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. + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: "https://www.apache.org/licenses/LICENSE-2.0.html" +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: "" + operationId: addPet + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/Pet" + application/json: + schema: + $ref: "#/components/schemas/Pet" + "405": + description: Invalid input + security: + - petstore_auth: + - "write:pets" + - "read:pets" + requestBody: + $ref: "#/components/requestBodies/Pet" + put: + tags: + - pet + summary: Update an existing pet + description: "" + operationId: updatePet + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/Pet" + application/json: + schema: + $ref: "#/components/schemas/Pet" + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - petstore_auth: + - "write:pets" + - "read:pets" + requestBody: + $ref: "#/components/requestBodies/Pet" + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + responses: + "200": + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: "#/components/schemas/Pet" + application/json: + schema: + type: array + items: + $ref: "#/components/schemas/Pet" + "400": + description: Invalid status value + security: + - petstore_auth: + - "read:pets" + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: >- + Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + "200": + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: "#/components/schemas/Pet" + application/json: + schema: + type: array + items: + $ref: "#/components/schemas/Pet" + "400": + description: Invalid tag value + security: + - petstore_auth: + - "read:pets" + deprecated: true + "/pet/{petId}": + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/Pet" + application/json: + schema: + $ref: "#/components/schemas/Pet" + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: "" + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - "write:pets" + - "read:pets" + requestBody: + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + delete: + tags: + - pet + summary: Deletes a pet + description: "" + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - "write:pets" + - "read:pets" + "/pet/{petId}/uploadImage": + post: + tags: + - pet + summary: uploads an image + description: "" + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + "200": + description: successful operation + content: + application/json: + schema: + $ref: "#/components/schemas/ApiResponse" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + type: string + format: binary + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: "" + operationId: placeOrder + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/Order" + application/json: + schema: + $ref: "#/components/schemas/Order" + "400": + description: Invalid Order + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Order" + description: order placed for purchasing the pet + required: true + "/store/order/{orderId}": + get: + tags: + - store + summary: Find purchase order by ID + description: >- + For valid response try integer IDs with value <= 5 or > 10. Other values + will generated exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/Order" + application/json: + schema: + $ref: "#/components/schemas/Order" + "400": + description: Invalid ID supplied + "404": + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: >- + For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/User" + description: Created user object + required: true + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: "" + operationId: createUsersWithArrayInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: "#/components/requestBodies/UserArray" + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: "" + operationId: createUsersWithListInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: "#/components/requestBodies/UserArray" + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: "" + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + "200": + description: successful operation + headers: + Set-Cookie: + description: >- + Cookie authentication key for use with the `api_key` + apiKey authentication. + schema: + type: string + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when toekn expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + "400": + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + "/user/{username}": + get: + tags: + - user + summary: Get user by user name + description: "" + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/User" + application/json: + schema: + $ref: "#/components/schemas/User" + "400": + description: Invalid username supplied + "404": + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/User" + description: Updated user object + required: true + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - api_key: [] +externalDocs: + description: Find out more about Swagger + url: "http://swagger.io" +components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: "#/components/schemas/User" + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: "#/components/schemas/Pet" + application/xml: + schema: + $ref: "#/components/schemas/Pet" + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog" + scopes: + "write:pets": modify pets in your account + "read:pets": read your pets + api_key: + type: apiKey + name: api_key + in: header + schemas: + OrderInfo: + title: Pet Order Info + description: An order info for a pets from the pet store + type: object + properties: + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + xml: + name: OrderInfo + SpecialInfo: + title: Pet Order Info + description: An order info for a pets from the pet store + discriminator: + propertyName: type + type: object + properties: + promotion: + type: boolean + type: + type: string + xml: + name: OrderInfo + Order: + title: Pet Order + description: An order for a pets from the pet store + allOf: + - $ref: '#/components/schemas/OrderInfo' + - $ref: '#/components/schemas/SpecialInfo' + type: object + properties: + id: + type: integer + format: int64 + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + comment: + type: string + nullable: true + xml: + name: Order + required: + - comment + Category: + title: Pet category + description: A category for a pet + type: object + nullable: true + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + nullable: true + userStatus: + type: integer + format: int32 + description: User Status + deepSliceModel: + nullable: true + type: array + description: An array 1-deep. + items: + type: array + description: An array 2-deep. + items: + type: array + description: An array 3-deep. + items: + $ref: "#/components/schemas/Tag" + deepSliceMap: + type: array + description: An array 1-deep. + items: + type: array + description: An array 2-deep. + items: + title: an Object + type: object + description: An array 3-deep. + properties: + tag: + $ref: "#/components/schemas/Tag" + Pet: + type: array + description: An array of pet. + items: + $ref: "#/components/schemas/Pet" + xml: + name: User + required: + - deepSliceModel + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + properties: + id: + type: integer + format: int64 + category: + $ref: "#/components/schemas/Category" + name: + type: string + example: doggie + photoUrls: + nullable: true + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + nullable: true + type: array + xml: + name: tag + wrapped: true + items: + $ref: "#/components/schemas/Tag" + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go index 863b9095b89..babc46eda26 100644 --- a/samples/server/petstore/go-api-server/go/api_pet.go +++ b/samples/server/petstore/go-api-server/go/api_pet.go @@ -103,12 +103,18 @@ func (c *PetApiController) Routes() Routes { // AddPet - Add a new pet to the store func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { - pet := &Pet{} - if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.AddPet(r.Context(), *pet) + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.AddPet(r.Context(), pet) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -193,12 +199,18 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { // UpdatePet - Update an existing pet func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { - pet := &Pet{} - if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.UpdatePet(r.Context(), *pet) + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdatePet(r.Context(), pet) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-api-server/go/api_store.go b/samples/server/petstore/go-api-server/go/api_store.go index f36cd41c523..134c0820607 100644 --- a/samples/server/petstore/go-api-server/go/api_store.go +++ b/samples/server/petstore/go-api-server/go/api_store.go @@ -128,12 +128,18 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request // PlaceOrder - Place an order for a pet func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) { - order := &Order{} - if err := json.NewDecoder(r.Body).Decode(&order); err != nil { + order := Order{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&order); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.PlaceOrder(r.Context(), *order) + if err := AssertOrderRequired(order); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.PlaceOrder(r.Context(), order) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-api-server/go/api_user.go b/samples/server/petstore/go-api-server/go/api_user.go index ebbcd8ad494..558fcf91ba0 100644 --- a/samples/server/petstore/go-api-server/go/api_user.go +++ b/samples/server/petstore/go-api-server/go/api_user.go @@ -103,12 +103,18 @@ func (c *UserApiController) Routes() Routes { // CreateUser - Create user func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { - user := &User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUser(r.Context(), *user) + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.CreateUser(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -121,12 +127,20 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { // CreateUsersWithArrayInput - Creates list of users with given input array func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) { - user := &[]User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUsersWithArrayInput(r.Context(), *user) + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithArrayInput(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -139,12 +153,20 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r * // CreateUsersWithListInput - Creates list of users with given input array func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) { - user := &[]User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUsersWithListInput(r.Context(), *user) + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithListInput(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -221,12 +243,18 @@ func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) username := params["username"] - user := &User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.UpdateUser(r.Context(), username, *user) + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdateUser(r.Context(), username, user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-api-server/go/error.go b/samples/server/petstore/go-api-server/go/error.go index 7dd60bc0850..2c0b010fe8d 100644 --- a/samples/server/petstore/go-api-server/go/error.go +++ b/samples/server/petstore/go-api-server/go/error.go @@ -10,9 +10,16 @@ package petstoreserver import ( + "errors" + "fmt" "net/http" ) +var ( + // ErrTypeAssertionError is thrown when type an interface does not match the asserted type + ErrTypeAssertionError = errors.New("unable to assert type") +) + // ParsingError indicates that an error has occurred when parsing request parameters type ParsingError struct { Err error @@ -26,6 +33,15 @@ func (e *ParsingError) Error() string { return e.Err.Error() } +// RequiredError indicates that an error has occurred when parsing request parameters +type RequiredError struct { + Field string +} + +func (e *RequiredError) Error() string { + return fmt.Sprintf("required field '%s' is zero value.", e.Field) +} + // ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if // you would like errors to be handled differently from the DefaultErrorHandler type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) @@ -36,6 +52,9 @@ func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, resu if _, ok := err.(*ParsingError); ok { // Handle parsing errors EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest), map[string][]string{}, w) + } else if _, ok := err.(*RequiredError); ok { + // Handle missing required errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusUnprocessableEntity), map[string][]string{}, w) } else { // Handle all other errors EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) diff --git a/samples/server/petstore/go-api-server/go/helpers.go b/samples/server/petstore/go-api-server/go/helpers.go index 179ee893f7f..ef41ca1c897 100644 --- a/samples/server/petstore/go-api-server/go/helpers.go +++ b/samples/server/petstore/go-api-server/go/helpers.go @@ -9,7 +9,11 @@ package petstoreserver -//Response return a ImplResponse struct filled +import ( + "reflect" +) + +// Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -18,7 +22,7 @@ func Response(code int, body interface{}) ImplResponse { } } -//ResponseWithHeaders return a ImplResponse struct filled, including headers +// ResponseWithHeaders return a ImplResponse struct filled, including headers func ResponseWithHeaders(code int, headers map[string][]string, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -26,3 +30,35 @@ func ResponseWithHeaders(code int, headers map[string][]string, body interface{} Body: body, } } + +// IsZeroValue checks if the val is the zero-ed value. +func IsZeroValue(val interface{}) bool { + return val == nil || reflect.DeepEqual(val, reflect.Zero(reflect.TypeOf(val)).Interface()) +} + +// AssertInterfaceRequired recursively checks each struct in a slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseInterfaceRequired(obj interface{}, callback func(interface{}) error) error { + return AssertRecurseValueRequired(reflect.ValueOf(obj), callback) +} + +// AssertNestedValueRequired checks each struct in the nested slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseValueRequired(value reflect.Value, callback func(interface{}) error) error { + switch value.Kind() { + // If it is a struct we check using callback + case reflect.Struct: + if err := callback(value.Interface()); err != nil { + return err + } + + // If it is a slice we continue recursion + case reflect.Slice: + for i := 0; i < value.Len(); i += 1 { + if err := AssertRecurseValueRequired(value.Index(i), callback); err != nil { + return err + } + } + } + return nil +} diff --git a/samples/server/petstore/go-api-server/go/model_api_response.go b/samples/server/petstore/go-api-server/go/model_api_response.go index 2379e169080..324cfbe0844 100644 --- a/samples/server/petstore/go-api-server/go/model_api_response.go +++ b/samples/server/petstore/go-api-server/go/model_api_response.go @@ -18,3 +18,20 @@ type ApiResponse struct { Message string `json:"message,omitempty"` } + +// AssertApiResponseRequired checks if the required fields are not zero-ed +func AssertApiResponseRequired(obj ApiResponse) error { + return nil +} + +// AssertRecurseApiResponseRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of ApiResponse (e.g. [][]ApiResponse), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseApiResponseRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aApiResponse, ok := obj.(ApiResponse) + if !ok { + return ErrTypeAssertionError + } + return AssertApiResponseRequired(aApiResponse) + }) +} diff --git a/samples/server/petstore/go-api-server/go/model_category.go b/samples/server/petstore/go-api-server/go/model_category.go index 5e6f9d247fa..3ae01892a3f 100644 --- a/samples/server/petstore/go-api-server/go/model_category.go +++ b/samples/server/petstore/go-api-server/go/model_category.go @@ -16,3 +16,20 @@ type Category struct { Name string `json:"name,omitempty"` } + +// AssertCategoryRequired checks if the required fields are not zero-ed +func AssertCategoryRequired(obj Category) error { + return nil +} + +// AssertRecurseCategoryRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Category (e.g. [][]Category), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseCategoryRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aCategory, ok := obj.(Category) + if !ok { + return ErrTypeAssertionError + } + return AssertCategoryRequired(aCategory) + }) +} diff --git a/samples/server/petstore/go-api-server/go/model_order.go b/samples/server/petstore/go-api-server/go/model_order.go index a9d8dbb7957..80ecfea3dc7 100644 --- a/samples/server/petstore/go-api-server/go/model_order.go +++ b/samples/server/petstore/go-api-server/go/model_order.go @@ -29,3 +29,20 @@ type Order struct { Complete bool `json:"complete,omitempty"` } + +// AssertOrderRequired checks if the required fields are not zero-ed +func AssertOrderRequired(obj Order) error { + return nil +} + +// AssertRecurseOrderRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Order (e.g. [][]Order), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseOrderRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aOrder, ok := obj.(Order) + if !ok { + return ErrTypeAssertionError + } + return AssertOrderRequired(aOrder) + }) +} diff --git a/samples/server/petstore/go-api-server/go/model_pet.go b/samples/server/petstore/go-api-server/go/model_pet.go index 3fb69fafe38..8e3dc7ad66f 100644 --- a/samples/server/petstore/go-api-server/go/model_pet.go +++ b/samples/server/petstore/go-api-server/go/model_pet.go @@ -26,3 +26,38 @@ type Pet struct { // Deprecated Status string `json:"status,omitempty"` } + +// AssertPetRequired checks if the required fields are not zero-ed +func AssertPetRequired(obj Pet) error { + elements := map[string]interface{}{ + "name": obj.Name, + "photoUrls": obj.PhotoUrls, + } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + + if err := AssertCategoryRequired(obj.Category); err != nil { + return err + } + for _, el := range obj.Tags { + if err := AssertTagRequired(el); err != nil { + return err + } + } + return nil +} + +// AssertRecursePetRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Pet (e.g. [][]Pet), otherwise ErrTypeAssertionError is thrown. +func AssertRecursePetRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aPet, ok := obj.(Pet) + if !ok { + return ErrTypeAssertionError + } + return AssertPetRequired(aPet) + }) +} diff --git a/samples/server/petstore/go-api-server/go/model_tag.go b/samples/server/petstore/go-api-server/go/model_tag.go index 2fb07fb32c4..0631ccc4866 100644 --- a/samples/server/petstore/go-api-server/go/model_tag.go +++ b/samples/server/petstore/go-api-server/go/model_tag.go @@ -16,3 +16,20 @@ type Tag struct { Name string `json:"name,omitempty"` } + +// AssertTagRequired checks if the required fields are not zero-ed +func AssertTagRequired(obj Tag) error { + return nil +} + +// AssertRecurseTagRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Tag (e.g. [][]Tag), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseTagRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aTag, ok := obj.(Tag) + if !ok { + return ErrTypeAssertionError + } + return AssertTagRequired(aTag) + }) +} diff --git a/samples/server/petstore/go-api-server/go/model_user.go b/samples/server/petstore/go-api-server/go/model_user.go index 8f40d0ac04c..83ac114e3c5 100644 --- a/samples/server/petstore/go-api-server/go/model_user.go +++ b/samples/server/petstore/go-api-server/go/model_user.go @@ -29,3 +29,20 @@ type User struct { // User Status UserStatus int32 `json:"userStatus,omitempty"` } + +// AssertUserRequired checks if the required fields are not zero-ed +func AssertUserRequired(obj User) error { + return nil +} + +// AssertRecurseUserRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of User (e.g. [][]User), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseUserRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aUser, ok := obj.(User) + if !ok { + return ErrTypeAssertionError + } + return AssertUserRequired(aUser) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/api_pet.go b/samples/server/petstore/go-chi-server/go/api_pet.go index b698977898f..074dfbb0eac 100644 --- a/samples/server/petstore/go-chi-server/go/api_pet.go +++ b/samples/server/petstore/go-chi-server/go/api_pet.go @@ -103,12 +103,18 @@ func (c *PetApiController) Routes() Routes { // AddPet - Add a new pet to the store func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { - pet := &Pet{} - if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.AddPet(r.Context(), *pet) + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.AddPet(r.Context(), pet) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -191,12 +197,18 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { // UpdatePet - Update an existing pet func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { - pet := &Pet{} - if err := json.NewDecoder(r.Body).Decode(&pet); err != nil { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.UpdatePet(r.Context(), *pet) + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdatePet(r.Context(), pet) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-chi-server/go/api_store.go b/samples/server/petstore/go-chi-server/go/api_store.go index cd2ee935689..af34ada596f 100644 --- a/samples/server/petstore/go-chi-server/go/api_store.go +++ b/samples/server/petstore/go-chi-server/go/api_store.go @@ -126,12 +126,18 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request // PlaceOrder - Place an order for a pet func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) { - order := &Order{} - if err := json.NewDecoder(r.Body).Decode(&order); err != nil { + order := Order{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&order); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.PlaceOrder(r.Context(), *order) + if err := AssertOrderRequired(order); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.PlaceOrder(r.Context(), order) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-chi-server/go/api_user.go b/samples/server/petstore/go-chi-server/go/api_user.go index 440cf54a437..f2c41d1695e 100644 --- a/samples/server/petstore/go-chi-server/go/api_user.go +++ b/samples/server/petstore/go-chi-server/go/api_user.go @@ -103,12 +103,18 @@ func (c *UserApiController) Routes() Routes { // CreateUser - Create user func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { - user := &User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUser(r.Context(), *user) + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.CreateUser(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -121,12 +127,20 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { // CreateUsersWithArrayInput - Creates list of users with given input array func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) { - user := &[]User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUsersWithArrayInput(r.Context(), *user) + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithArrayInput(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -139,12 +153,20 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r * // CreateUsersWithListInput - Creates list of users with given input array func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) { - user := &[]User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.CreateUsersWithListInput(r.Context(), *user) + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithListInput(r.Context(), user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) @@ -218,12 +240,18 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { username := chi.URLParam(r, "username") - user := &User{} - if err := json.NewDecoder(r.Body).Decode(&user); err != nil { + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.UpdateUser(r.Context(), username, *user) + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdateUser(r.Context(), username, user) // If an error occurred, encode the error with the status code if err != nil { c.errorHandler(w, r, err, &result) diff --git a/samples/server/petstore/go-chi-server/go/error.go b/samples/server/petstore/go-chi-server/go/error.go index 7dd60bc0850..2c0b010fe8d 100644 --- a/samples/server/petstore/go-chi-server/go/error.go +++ b/samples/server/petstore/go-chi-server/go/error.go @@ -10,9 +10,16 @@ package petstoreserver import ( + "errors" + "fmt" "net/http" ) +var ( + // ErrTypeAssertionError is thrown when type an interface does not match the asserted type + ErrTypeAssertionError = errors.New("unable to assert type") +) + // ParsingError indicates that an error has occurred when parsing request parameters type ParsingError struct { Err error @@ -26,6 +33,15 @@ func (e *ParsingError) Error() string { return e.Err.Error() } +// RequiredError indicates that an error has occurred when parsing request parameters +type RequiredError struct { + Field string +} + +func (e *RequiredError) Error() string { + return fmt.Sprintf("required field '%s' is zero value.", e.Field) +} + // ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if // you would like errors to be handled differently from the DefaultErrorHandler type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) @@ -36,6 +52,9 @@ func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, resu if _, ok := err.(*ParsingError); ok { // Handle parsing errors EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest), map[string][]string{}, w) + } else if _, ok := err.(*RequiredError); ok { + // Handle missing required errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusUnprocessableEntity), map[string][]string{}, w) } else { // Handle all other errors EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) diff --git a/samples/server/petstore/go-chi-server/go/helpers.go b/samples/server/petstore/go-chi-server/go/helpers.go index 179ee893f7f..ef41ca1c897 100644 --- a/samples/server/petstore/go-chi-server/go/helpers.go +++ b/samples/server/petstore/go-chi-server/go/helpers.go @@ -9,7 +9,11 @@ package petstoreserver -//Response return a ImplResponse struct filled +import ( + "reflect" +) + +// Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -18,7 +22,7 @@ func Response(code int, body interface{}) ImplResponse { } } -//ResponseWithHeaders return a ImplResponse struct filled, including headers +// ResponseWithHeaders return a ImplResponse struct filled, including headers func ResponseWithHeaders(code int, headers map[string][]string, body interface{}) ImplResponse { return ImplResponse { Code: code, @@ -26,3 +30,35 @@ func ResponseWithHeaders(code int, headers map[string][]string, body interface{} Body: body, } } + +// IsZeroValue checks if the val is the zero-ed value. +func IsZeroValue(val interface{}) bool { + return val == nil || reflect.DeepEqual(val, reflect.Zero(reflect.TypeOf(val)).Interface()) +} + +// AssertInterfaceRequired recursively checks each struct in a slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseInterfaceRequired(obj interface{}, callback func(interface{}) error) error { + return AssertRecurseValueRequired(reflect.ValueOf(obj), callback) +} + +// AssertNestedValueRequired checks each struct in the nested slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseValueRequired(value reflect.Value, callback func(interface{}) error) error { + switch value.Kind() { + // If it is a struct we check using callback + case reflect.Struct: + if err := callback(value.Interface()); err != nil { + return err + } + + // If it is a slice we continue recursion + case reflect.Slice: + for i := 0; i < value.Len(); i += 1 { + if err := AssertRecurseValueRequired(value.Index(i), callback); err != nil { + return err + } + } + } + return nil +} diff --git a/samples/server/petstore/go-chi-server/go/model_api_response.go b/samples/server/petstore/go-chi-server/go/model_api_response.go index 2379e169080..324cfbe0844 100644 --- a/samples/server/petstore/go-chi-server/go/model_api_response.go +++ b/samples/server/petstore/go-chi-server/go/model_api_response.go @@ -18,3 +18,20 @@ type ApiResponse struct { Message string `json:"message,omitempty"` } + +// AssertApiResponseRequired checks if the required fields are not zero-ed +func AssertApiResponseRequired(obj ApiResponse) error { + return nil +} + +// AssertRecurseApiResponseRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of ApiResponse (e.g. [][]ApiResponse), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseApiResponseRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aApiResponse, ok := obj.(ApiResponse) + if !ok { + return ErrTypeAssertionError + } + return AssertApiResponseRequired(aApiResponse) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/model_category.go b/samples/server/petstore/go-chi-server/go/model_category.go index 5e6f9d247fa..3ae01892a3f 100644 --- a/samples/server/petstore/go-chi-server/go/model_category.go +++ b/samples/server/petstore/go-chi-server/go/model_category.go @@ -16,3 +16,20 @@ type Category struct { Name string `json:"name,omitempty"` } + +// AssertCategoryRequired checks if the required fields are not zero-ed +func AssertCategoryRequired(obj Category) error { + return nil +} + +// AssertRecurseCategoryRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Category (e.g. [][]Category), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseCategoryRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aCategory, ok := obj.(Category) + if !ok { + return ErrTypeAssertionError + } + return AssertCategoryRequired(aCategory) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/model_order.go b/samples/server/petstore/go-chi-server/go/model_order.go index a9d8dbb7957..80ecfea3dc7 100644 --- a/samples/server/petstore/go-chi-server/go/model_order.go +++ b/samples/server/petstore/go-chi-server/go/model_order.go @@ -29,3 +29,20 @@ type Order struct { Complete bool `json:"complete,omitempty"` } + +// AssertOrderRequired checks if the required fields are not zero-ed +func AssertOrderRequired(obj Order) error { + return nil +} + +// AssertRecurseOrderRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Order (e.g. [][]Order), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseOrderRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aOrder, ok := obj.(Order) + if !ok { + return ErrTypeAssertionError + } + return AssertOrderRequired(aOrder) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/model_pet.go b/samples/server/petstore/go-chi-server/go/model_pet.go index 3fb69fafe38..8e3dc7ad66f 100644 --- a/samples/server/petstore/go-chi-server/go/model_pet.go +++ b/samples/server/petstore/go-chi-server/go/model_pet.go @@ -26,3 +26,38 @@ type Pet struct { // Deprecated Status string `json:"status,omitempty"` } + +// AssertPetRequired checks if the required fields are not zero-ed +func AssertPetRequired(obj Pet) error { + elements := map[string]interface{}{ + "name": obj.Name, + "photoUrls": obj.PhotoUrls, + } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + + if err := AssertCategoryRequired(obj.Category); err != nil { + return err + } + for _, el := range obj.Tags { + if err := AssertTagRequired(el); err != nil { + return err + } + } + return nil +} + +// AssertRecursePetRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Pet (e.g. [][]Pet), otherwise ErrTypeAssertionError is thrown. +func AssertRecursePetRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aPet, ok := obj.(Pet) + if !ok { + return ErrTypeAssertionError + } + return AssertPetRequired(aPet) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/model_tag.go b/samples/server/petstore/go-chi-server/go/model_tag.go index 2fb07fb32c4..0631ccc4866 100644 --- a/samples/server/petstore/go-chi-server/go/model_tag.go +++ b/samples/server/petstore/go-chi-server/go/model_tag.go @@ -16,3 +16,20 @@ type Tag struct { Name string `json:"name,omitempty"` } + +// AssertTagRequired checks if the required fields are not zero-ed +func AssertTagRequired(obj Tag) error { + return nil +} + +// AssertRecurseTagRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Tag (e.g. [][]Tag), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseTagRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aTag, ok := obj.(Tag) + if !ok { + return ErrTypeAssertionError + } + return AssertTagRequired(aTag) + }) +} diff --git a/samples/server/petstore/go-chi-server/go/model_user.go b/samples/server/petstore/go-chi-server/go/model_user.go index 8f40d0ac04c..83ac114e3c5 100644 --- a/samples/server/petstore/go-chi-server/go/model_user.go +++ b/samples/server/petstore/go-chi-server/go/model_user.go @@ -29,3 +29,20 @@ type User struct { // User Status UserStatus int32 `json:"userStatus,omitempty"` } + +// AssertUserRequired checks if the required fields are not zero-ed +func AssertUserRequired(obj User) error { + return nil +} + +// AssertRecurseUserRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of User (e.g. [][]User), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseUserRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aUser, ok := obj.(User) + if !ok { + return ErrTypeAssertionError + } + return AssertUserRequired(aUser) + }) +} diff --git a/samples/server/petstore/go-server-required/.openapi-generator-ignore b/samples/server/petstore/go-server-required/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/server/petstore/go-server-required/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/go-server-required/.openapi-generator/FILES b/samples/server/petstore/go-server-required/.openapi-generator/FILES new file mode 100644 index 00000000000..26b2edca0b8 --- /dev/null +++ b/samples/server/petstore/go-server-required/.openapi-generator/FILES @@ -0,0 +1,25 @@ +Dockerfile +README.md +api/openapi.yaml +go.mod +go/api.go +go/api_pet.go +go/api_pet_service.go +go/api_store.go +go/api_store_service.go +go/api_user.go +go/api_user_service.go +go/error.go +go/helpers.go +go/impl.go +go/logger.go +go/model_api_response.go +go/model_category.go +go/model_order.go +go/model_order_info.go +go/model_pet.go +go/model_special_info.go +go/model_tag.go +go/model_user.go +go/routers.go +main.go diff --git a/samples/server/petstore/go-server-required/.openapi-generator/VERSION b/samples/server/petstore/go-server-required/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/server/petstore/go-server-required/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-server-required/Dockerfile b/samples/server/petstore/go-server-required/Dockerfile new file mode 100644 index 00000000000..cfdfbaed080 --- /dev/null +++ b/samples/server/petstore/go-server-required/Dockerfile @@ -0,0 +1,14 @@ +FROM golang:1.10 AS build +WORKDIR /go/src +COPY go ./go +COPY main.go . + +ENV CGO_ENABLED=0 +RUN go get -d -v ./... + +RUN go build -a -installsuffix cgo -o petstoreserver . + +FROM scratch AS runtime +COPY --from=build /go/src/petstoreserver ./ +EXPOSE 8080/tcp +ENTRYPOINT ["./petstoreserver"] diff --git a/samples/server/petstore/go-server-required/README.md b/samples/server/petstore/go-server-required/README.md new file mode 100644 index 00000000000..fbcf4ae661b --- /dev/null +++ b/samples/server/petstore/go-server-required/README.md @@ -0,0 +1,35 @@ +# Go API Server for petstoreserver + +This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + +## Overview +This server was generated by the [openapi-generator] +(https://openapi-generator.tech) project. +By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub. +- + +To see how to make this your own, look here: + +[README](https://openapi-generator.tech) + +- API version: 1.0.0 + + +### Running the server +To run the server, follow these simple steps: + +``` +go run main.go +``` + +To run the server in a docker container +``` +docker build --network=host -t petstoreserver . +``` + +Once image is built use +``` +docker run --rm -it petstoreserver +``` + + diff --git a/samples/server/petstore/go-server-required/api/openapi.yaml b/samples/server/petstore/go-server-required/api/openapi.yaml new file mode 100644 index 00000000000..a3021416717 --- /dev/null +++ b/samples/server/petstore/go-server-required/api/openapi.yaml @@ -0,0 +1,906 @@ +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. + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +externalDocs: + description: Find out more about Swagger + url: http://swagger.io +servers: +- url: http://petstore.swagger.io/v2 +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /pet: + post: + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + $ref: '#/components/requestBodies/inline_object' + content: + application/x-www-form-urlencoded: + schema: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + $ref: '#/components/requestBodies/inline_object_1' + content: + multipart/form-data: + schema: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{orderId}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: orderId + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: orderId + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Create user + tags: + - user + /user/createWithArray: + post: + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + pattern: ^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$ + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + Set-Cookie: + description: Cookie authentication key for use with the `api_key` apiKey + authentication. + explode: false + schema: + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + type: string + style: simple + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when toekn expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - api_key: [] + summary: Delete user + tags: + - user + get: + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + security: + - api_key: [] + summary: Updated user + tags: + - user +components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + inline_object: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/inline_object' + inline_object_1: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/inline_object_1' + schemas: + OrderInfo: + description: An order info for a pets from the pet store + properties: + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + format: date-time + type: string + title: Pet Order Info + type: object + xml: + name: OrderInfo + SpecialInfo: + description: An order info for a pets from the pet store + discriminator: + propertyName: type + properties: + promotion: + type: boolean + type: + type: string + title: Pet Order Info + type: object + xml: + name: OrderInfo + Order: + allOf: + - $ref: '#/components/schemas/OrderInfo' + - $ref: '#/components/schemas/SpecialInfo' + description: An order for a pets from the pet store + example: + comment: comment + id: 0 + complete: false + status: placed + properties: + id: + format: int64 + type: integer + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + comment: + nullable: true + type: string + required: + - comment + title: Pet Order + type: object + xml: + name: Order + Category: + description: A category for a pet + example: + name: name + id: 6 + nullable: true + properties: + id: + format: int64 + type: integer + name: + pattern: ^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$ + type: string + title: Pet category + type: object + xml: + name: Category + User: + description: A User who is purchasing from the pet store + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + phone: phone + deepSliceModel: + - - - name: name + id: 1 + - name: name + id: 1 + - - name: name + id: 1 + - name: name + id: 1 + - - - name: name + id: 1 + - name: name + id: 1 + - - name: name + id: 1 + - name: name + id: 1 + id: 0 + deepSliceMap: + - - '{}' + - '{}' + - - '{}' + - '{}' + email: email + username: username + properties: + id: + format: int64 + type: integer + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + nullable: true + type: string + userStatus: + description: User Status + format: int32 + type: integer + deepSliceModel: + description: An array 1-deep. + items: + description: An array 2-deep. + items: + description: An array 3-deep. + items: + $ref: '#/components/schemas/Tag' + type: array + type: array + nullable: true + type: array + deepSliceMap: + description: An array 1-deep. + items: + description: An array 2-deep. + items: + description: An array 3-deep. + properties: + tag: + $ref: '#/components/schemas/Tag' + Pet: + description: An array of pet. + items: + $ref: '#/components/schemas/Pet' + type: array + title: an Object + type: object + type: array + type: array + required: + - deepSliceModel + title: a User + type: object + xml: + name: User + Tag: + description: A tag for a pet + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet Tag + type: object + xml: + name: Tag + Pet: + description: A pet for sale in the pet store + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + nullable: true + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + nullable: true + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + title: a Pet + type: object + xml: + name: Pet + ApiResponse: + description: Describes the result of uploading an image resource + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + title: An uploaded response + type: object + inline_object: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + inline_object_1: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey diff --git a/samples/server/petstore/go-server-required/go.mod b/samples/server/petstore/go-server-required/go.mod new file mode 100644 index 00000000000..fa1221d2bed --- /dev/null +++ b/samples/server/petstore/go-server-required/go.mod @@ -0,0 +1,5 @@ +module github.com/GIT_USER_ID/GIT_REPO_ID + +go 1.13 + +require github.com/go-chi/chi/v5 v5.0.3 diff --git a/samples/server/petstore/go-server-required/go/api.go b/samples/server/petstore/go-server-required/go/api.go new file mode 100644 index 00000000000..5556474295e --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api.go @@ -0,0 +1,100 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "context" + "net/http" + "os" +) + + + +// PetApiRouter defines the required methods for binding the api requests to a responses for the PetApi +// The PetApiRouter implementation should parse necessary information from the http request, +// pass the data to a PetApiServicer to perform the required actions, then write the service results to the http response. +type PetApiRouter interface { + AddPet(http.ResponseWriter, *http.Request) + DeletePet(http.ResponseWriter, *http.Request) + FindPetsByStatus(http.ResponseWriter, *http.Request) + // Deprecated + FindPetsByTags(http.ResponseWriter, *http.Request) + GetPetById(http.ResponseWriter, *http.Request) + UpdatePet(http.ResponseWriter, *http.Request) + UpdatePetWithForm(http.ResponseWriter, *http.Request) + UploadFile(http.ResponseWriter, *http.Request) +} +// StoreApiRouter defines the required methods for binding the api requests to a responses for the StoreApi +// The StoreApiRouter implementation should parse necessary information from the http request, +// pass the data to a StoreApiServicer to perform the required actions, then write the service results to the http response. +type StoreApiRouter interface { + DeleteOrder(http.ResponseWriter, *http.Request) + GetInventory(http.ResponseWriter, *http.Request) + GetOrderById(http.ResponseWriter, *http.Request) + PlaceOrder(http.ResponseWriter, *http.Request) +} +// UserApiRouter defines the required methods for binding the api requests to a responses for the UserApi +// The UserApiRouter implementation should parse necessary information from the http request, +// pass the data to a UserApiServicer to perform the required actions, then write the service results to the http response. +type UserApiRouter interface { + CreateUser(http.ResponseWriter, *http.Request) + CreateUsersWithArrayInput(http.ResponseWriter, *http.Request) + CreateUsersWithListInput(http.ResponseWriter, *http.Request) + DeleteUser(http.ResponseWriter, *http.Request) + GetUserByName(http.ResponseWriter, *http.Request) + LoginUser(http.ResponseWriter, *http.Request) + LogoutUser(http.ResponseWriter, *http.Request) + UpdateUser(http.ResponseWriter, *http.Request) +} + + +// PetApiServicer defines the api actions for the PetApi service +// This interface intended to stay up to date with the openapi yaml used to generate it, +// while the service implementation can ignored with the .openapi-generator-ignore file +// and updated with the logic required for the API. +type PetApiServicer interface { + AddPet(context.Context, Pet) (ImplResponse, error) + DeletePet(context.Context, int64, string) (ImplResponse, error) + FindPetsByStatus(context.Context, []string) (ImplResponse, error) + // Deprecated + FindPetsByTags(context.Context, []string) (ImplResponse, error) + GetPetById(context.Context, int64) (ImplResponse, error) + UpdatePet(context.Context, Pet) (ImplResponse, error) + UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error) + UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error) +} + + +// StoreApiServicer defines the api actions for the StoreApi service +// This interface intended to stay up to date with the openapi yaml used to generate it, +// while the service implementation can ignored with the .openapi-generator-ignore file +// and updated with the logic required for the API. +type StoreApiServicer interface { + DeleteOrder(context.Context, string) (ImplResponse, error) + GetInventory(context.Context) (ImplResponse, error) + GetOrderById(context.Context, int64) (ImplResponse, error) + PlaceOrder(context.Context, Order) (ImplResponse, error) +} + + +// UserApiServicer defines the api actions for the UserApi service +// This interface intended to stay up to date with the openapi yaml used to generate it, +// while the service implementation can ignored with the .openapi-generator-ignore file +// and updated with the logic required for the API. +type UserApiServicer interface { + CreateUser(context.Context, User) (ImplResponse, error) + CreateUsersWithArrayInput(context.Context, []User) (ImplResponse, error) + CreateUsersWithListInput(context.Context, []User) (ImplResponse, error) + DeleteUser(context.Context, string) (ImplResponse, error) + GetUserByName(context.Context, string) (ImplResponse, error) + LoginUser(context.Context, string, string) (ImplResponse, error) + LogoutUser(context.Context) (ImplResponse, error) + UpdateUser(context.Context, string, User) (ImplResponse, error) +} diff --git a/samples/server/petstore/go-server-required/go/api_pet.go b/samples/server/petstore/go-server-required/go/api_pet.go new file mode 100644 index 00000000000..074dfbb0eac --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_pet.go @@ -0,0 +1,275 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "encoding/json" + "net/http" + "strings" + + "github.com/go-chi/chi/v5" +) + +// PetApiController binds http requests to an api service and writes the service results to the http response +type PetApiController struct { + service PetApiServicer + errorHandler ErrorHandler +} + +// PetApiOption for how the controller is set up. +type PetApiOption func(*PetApiController) + +// WithPetApiErrorHandler inject ErrorHandler into controller +func WithPetApiErrorHandler(h ErrorHandler) PetApiOption { + return func(c *PetApiController) { + c.errorHandler = h + } +} + +// NewPetApiController creates a default api controller +func NewPetApiController(s PetApiServicer, opts ...PetApiOption) Router { + controller := &PetApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller +} + +// Routes returns all of the api route for the PetApiController +func (c *PetApiController) Routes() Routes { + return Routes{ + { + "AddPet", + strings.ToUpper("Post"), + "/v2/pet", + c.AddPet, + }, + { + "DeletePet", + strings.ToUpper("Delete"), + "/v2/pet/{petId}", + c.DeletePet, + }, + { + "FindPetsByStatus", + strings.ToUpper("Get"), + "/v2/pet/findByStatus", + c.FindPetsByStatus, + }, + { + "FindPetsByTags", + strings.ToUpper("Get"), + "/v2/pet/findByTags", + c.FindPetsByTags, + }, + { + "GetPetById", + strings.ToUpper("Get"), + "/v2/pet/{petId}", + c.GetPetById, + }, + { + "UpdatePet", + strings.ToUpper("Put"), + "/v2/pet", + c.UpdatePet, + }, + { + "UpdatePetWithForm", + strings.ToUpper("Post"), + "/v2/pet/{petId}", + c.UpdatePetWithForm, + }, + { + "UploadFile", + strings.ToUpper("Post"), + "/v2/pet/{petId}/uploadImage", + c.UploadFile, + }, + } +} + +// AddPet - Add a new pet to the store +func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.AddPet(r.Context(), pet) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// DeletePet - Deletes a pet +func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { + petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + + apiKey := r.Header.Get("api_key") + result, err := c.service.DeletePet(r.Context(), petId, apiKey) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// FindPetsByStatus - Finds Pets by status +func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Request) { + query := r.URL.Query() + status := strings.Split(query.Get("status"), ",") + result, err := c.service.FindPetsByStatus(r.Context(), status) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// FindPetsByTags - Finds Pets by tags +// Deprecated +func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request) { + query := r.URL.Query() + tags := strings.Split(query.Get("tags"), ",") + result, err := c.service.FindPetsByTags(r.Context(), tags) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// GetPetById - Find pet by ID +func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { + petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + + result, err := c.service.GetPetById(r.Context(), petId) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// UpdatePet - Update an existing pet +func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) { + pet := Pet{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&pet); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + if err := AssertPetRequired(pet); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdatePet(r.Context(), pet) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// UpdatePetWithForm - Updates a pet in the store with form data +func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Request) { + if err := r.ParseForm(); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + + name := r.FormValue("name") + status := r.FormValue("status") + result, err := c.service.UpdatePetWithForm(r.Context(), petId, name, status) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// UploadFile - uploads an image +func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + petId, err := parseInt64Parameter(chi.URLParam(r, "petId"), true) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + + additionalMetadata := r.FormValue("additionalMetadata") + + file, err := ReadFormFileToTempFile(r, "file") + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + result, err := c.service.UploadFile(r.Context(), petId, additionalMetadata, file) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} diff --git a/samples/server/petstore/go-server-required/go/api_pet_service.go b/samples/server/petstore/go-server-required/go/api_pet_service.go new file mode 100644 index 00000000000..c612d222a87 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_pet_service.go @@ -0,0 +1,142 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "context" + "net/http" + "errors" + "os" +) + +// PetApiService is a service that implents the logic for the PetApiServicer +// This service should implement the business logic for every endpoint for the PetApi API. +// Include any external packages or services that will be required by this service. +type PetApiService struct { +} + +// NewPetApiService creates a default api service +func NewPetApiService() PetApiServicer { + return &PetApiService{} +} + +// AddPet - Add a new pet to the store +func (s *PetApiService) AddPet(ctx context.Context, pet Pet) (ImplResponse, error) { + // TODO - update AddPet with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, Pet{}) or use other options such as http.Ok ... + //return Response(200, Pet{}), nil + + //TODO: Uncomment the next line to return response Response(405, {}) or use other options such as http.Ok ... + //return Response(405, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("AddPet method not implemented") +} + +// DeletePet - Deletes a pet +func (s *PetApiService) DeletePet(ctx context.Context, petId int64, apiKey string) (ImplResponse, error) { + // TODO - update DeletePet with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("DeletePet method not implemented") +} + +// FindPetsByStatus - Finds Pets by status +func (s *PetApiService) FindPetsByStatus(ctx context.Context, status []string) (ImplResponse, error) { + // TODO - update FindPetsByStatus with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, []Pet{}) or use other options such as http.Ok ... + //return Response(200, []Pet{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("FindPetsByStatus method not implemented") +} + +// FindPetsByTags - Finds Pets by tags +// Deprecated +func (s *PetApiService) FindPetsByTags(ctx context.Context, tags []string) (ImplResponse, error) { + // TODO - update FindPetsByTags with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, []Pet{}) or use other options such as http.Ok ... + //return Response(200, []Pet{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("FindPetsByTags method not implemented") +} + +// GetPetById - Find pet by ID +func (s *PetApiService) GetPetById(ctx context.Context, petId int64) (ImplResponse, error) { + // TODO - update GetPetById with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, Pet{}) or use other options such as http.Ok ... + //return Response(200, Pet{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("GetPetById method not implemented") +} + +// UpdatePet - Update an existing pet +func (s *PetApiService) UpdatePet(ctx context.Context, pet Pet) (ImplResponse, error) { + // TODO - update UpdatePet with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, Pet{}) or use other options such as http.Ok ... + //return Response(200, Pet{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + //TODO: Uncomment the next line to return response Response(405, {}) or use other options such as http.Ok ... + //return Response(405, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("UpdatePet method not implemented") +} + +// UpdatePetWithForm - Updates a pet in the store with form data +func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name string, status string) (ImplResponse, error) { + // TODO - update UpdatePetWithForm with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(405, {}) or use other options such as http.Ok ... + //return Response(405, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("UpdatePetWithForm method not implemented") +} + +// UploadFile - uploads an image +func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) { + // TODO - update UploadFile with the required logic for this service method. + // Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, ApiResponse{}) or use other options such as http.Ok ... + //return Response(200, ApiResponse{}), nil + + return Response(http.StatusNotImplemented, nil), errors.New("UploadFile method not implemented") +} + diff --git a/samples/server/petstore/go-server-required/go/api_store.go b/samples/server/petstore/go-server-required/go/api_store.go new file mode 100644 index 00000000000..af34ada596f --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_store.go @@ -0,0 +1,149 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "encoding/json" + "net/http" + "strings" + + "github.com/go-chi/chi/v5" +) + +// StoreApiController binds http requests to an api service and writes the service results to the http response +type StoreApiController struct { + service StoreApiServicer + errorHandler ErrorHandler +} + +// StoreApiOption for how the controller is set up. +type StoreApiOption func(*StoreApiController) + +// WithStoreApiErrorHandler inject ErrorHandler into controller +func WithStoreApiErrorHandler(h ErrorHandler) StoreApiOption { + return func(c *StoreApiController) { + c.errorHandler = h + } +} + +// NewStoreApiController creates a default api controller +func NewStoreApiController(s StoreApiServicer, opts ...StoreApiOption) Router { + controller := &StoreApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller +} + +// Routes returns all of the api route for the StoreApiController +func (c *StoreApiController) Routes() Routes { + return Routes{ + { + "DeleteOrder", + strings.ToUpper("Delete"), + "/v2/store/order/{orderId}", + c.DeleteOrder, + }, + { + "GetInventory", + strings.ToUpper("Get"), + "/v2/store/inventory", + c.GetInventory, + }, + { + "GetOrderById", + strings.ToUpper("Get"), + "/v2/store/order/{orderId}", + c.GetOrderById, + }, + { + "PlaceOrder", + strings.ToUpper("Post"), + "/v2/store/order", + c.PlaceOrder, + }, + } +} + +// DeleteOrder - Delete purchase order by ID +func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) { + orderId := chi.URLParam(r, "orderId") + + result, err := c.service.DeleteOrder(r.Context(), orderId) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// GetInventory - Returns pet inventories by status +func (c *StoreApiController) GetInventory(w http.ResponseWriter, r *http.Request) { + result, err := c.service.GetInventory(r.Context()) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// GetOrderById - Find purchase order by ID +func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request) { + orderId, err := parseInt64Parameter(chi.URLParam(r, "orderId"), true) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + + result, err := c.service.GetOrderById(r.Context(), orderId) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// PlaceOrder - Place an order for a pet +func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) { + order := Order{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&order); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + if err := AssertOrderRequired(order); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.PlaceOrder(r.Context(), order) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} diff --git a/samples/server/petstore/go-server-required/go/api_store_service.go b/samples/server/petstore/go-server-required/go/api_store_service.go new file mode 100644 index 00000000000..27da55939a3 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_store_service.go @@ -0,0 +1,84 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "context" + "net/http" + "errors" +) + +// StoreApiService is a service that implents the logic for the StoreApiServicer +// This service should implement the business logic for every endpoint for the StoreApi API. +// Include any external packages or services that will be required by this service. +type StoreApiService struct { +} + +// NewStoreApiService creates a default api service +func NewStoreApiService() StoreApiServicer { + return &StoreApiService{} +} + +// DeleteOrder - Delete purchase order by ID +func (s *StoreApiService) DeleteOrder(ctx context.Context, orderId string) (ImplResponse, error) { + // TODO - update DeleteOrder with the required logic for this service method. + // Add api_store_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("DeleteOrder method not implemented") +} + +// GetInventory - Returns pet inventories by status +func (s *StoreApiService) GetInventory(ctx context.Context) (ImplResponse, error) { + // TODO - update GetInventory with the required logic for this service method. + // Add api_store_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, map[string]int32{}) or use other options such as http.Ok ... + //return Response(200, map[string]int32{}), nil + + return Response(http.StatusNotImplemented, nil), errors.New("GetInventory method not implemented") +} + +// GetOrderById - Find purchase order by ID +func (s *StoreApiService) GetOrderById(ctx context.Context, orderId int64) (ImplResponse, error) { + // TODO - update GetOrderById with the required logic for this service method. + // Add api_store_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, Order{}) or use other options such as http.Ok ... + //return Response(200, Order{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("GetOrderById method not implemented") +} + +// PlaceOrder - Place an order for a pet +func (s *StoreApiService) PlaceOrder(ctx context.Context, order Order) (ImplResponse, error) { + // TODO - update PlaceOrder with the required logic for this service method. + // Add api_store_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, Order{}) or use other options such as http.Ok ... + //return Response(200, Order{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("PlaceOrder method not implemented") +} + diff --git a/samples/server/petstore/go-server-required/go/api_user.go b/samples/server/petstore/go-server-required/go/api_user.go new file mode 100644 index 00000000000..f2c41d1695e --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_user.go @@ -0,0 +1,263 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "encoding/json" + "net/http" + "strings" + + "github.com/go-chi/chi/v5" +) + +// UserApiController binds http requests to an api service and writes the service results to the http response +type UserApiController struct { + service UserApiServicer + errorHandler ErrorHandler +} + +// UserApiOption for how the controller is set up. +type UserApiOption func(*UserApiController) + +// WithUserApiErrorHandler inject ErrorHandler into controller +func WithUserApiErrorHandler(h ErrorHandler) UserApiOption { + return func(c *UserApiController) { + c.errorHandler = h + } +} + +// NewUserApiController creates a default api controller +func NewUserApiController(s UserApiServicer, opts ...UserApiOption) Router { + controller := &UserApiController{ + service: s, + errorHandler: DefaultErrorHandler, + } + + for _, opt := range opts { + opt(controller) + } + + return controller +} + +// Routes returns all of the api route for the UserApiController +func (c *UserApiController) Routes() Routes { + return Routes{ + { + "CreateUser", + strings.ToUpper("Post"), + "/v2/user", + c.CreateUser, + }, + { + "CreateUsersWithArrayInput", + strings.ToUpper("Post"), + "/v2/user/createWithArray", + c.CreateUsersWithArrayInput, + }, + { + "CreateUsersWithListInput", + strings.ToUpper("Post"), + "/v2/user/createWithList", + c.CreateUsersWithListInput, + }, + { + "DeleteUser", + strings.ToUpper("Delete"), + "/v2/user/{username}", + c.DeleteUser, + }, + { + "GetUserByName", + strings.ToUpper("Get"), + "/v2/user/{username}", + c.GetUserByName, + }, + { + "LoginUser", + strings.ToUpper("Get"), + "/v2/user/login", + c.LoginUser, + }, + { + "LogoutUser", + strings.ToUpper("Get"), + "/v2/user/logout", + c.LogoutUser, + }, + { + "UpdateUser", + strings.ToUpper("Put"), + "/v2/user/{username}", + c.UpdateUser, + }, + } +} + +// CreateUser - Create user +func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) { + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.CreateUser(r.Context(), user) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// CreateUsersWithArrayInput - Creates list of users with given input array +func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithArrayInput(r.Context(), user) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// CreateUsersWithListInput - Creates list of users with given input array +func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) { + user := []User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + for _, el := range user { + if err := AssertUserRequired(el); err != nil { + c.errorHandler(w, r, err, nil) + return + } + } + result, err := c.service.CreateUsersWithListInput(r.Context(), user) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// DeleteUser - Delete user +func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { + username := chi.URLParam(r, "username") + + result, err := c.service.DeleteUser(r.Context(), username) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// GetUserByName - Get user by user name +func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request) { + username := chi.URLParam(r, "username") + + result, err := c.service.GetUserByName(r.Context(), username) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// LoginUser - Logs user into the system +func (c *UserApiController) LoginUser(w http.ResponseWriter, r *http.Request) { + query := r.URL.Query() + username := query.Get("username") + password := query.Get("password") + result, err := c.service.LoginUser(r.Context(), username, password) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// LogoutUser - Logs out current logged in user session +func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { + result, err := c.service.LogoutUser(r.Context()) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} + +// UpdateUser - Updated user +func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { + username := chi.URLParam(r, "username") + + user := User{} + d := json.NewDecoder(r.Body) + d.DisallowUnknownFields() + if err := d.Decode(&user); err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + if err := AssertUserRequired(user); err != nil { + c.errorHandler(w, r, err, nil) + return + } + result, err := c.service.UpdateUser(r.Context(), username, user) + // If an error occurred, encode the error with the status code + if err != nil { + c.errorHandler(w, r, err, &result) + return + } + // If no error, encode the body and the result code + EncodeJSONResponse(result.Body, &result.Code, result.Headers, w) + +} diff --git a/samples/server/petstore/go-server-required/go/api_user_service.go b/samples/server/petstore/go-server-required/go/api_user_service.go new file mode 100644 index 00000000000..c14d96ab368 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/api_user_service.go @@ -0,0 +1,131 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "context" + "net/http" + "errors" +) + +// UserApiService is a service that implents the logic for the UserApiServicer +// This service should implement the business logic for every endpoint for the UserApi API. +// Include any external packages or services that will be required by this service. +type UserApiService struct { +} + +// NewUserApiService creates a default api service +func NewUserApiService() UserApiServicer { + return &UserApiService{} +} + +// CreateUser - Create user +func (s *UserApiService) CreateUser(ctx context.Context, user User) (ImplResponse, error) { + // TODO - update CreateUser with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(0, {}) or use other options such as http.Ok ... + //return Response(0, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("CreateUser method not implemented") +} + +// CreateUsersWithArrayInput - Creates list of users with given input array +func (s *UserApiService) CreateUsersWithArrayInput(ctx context.Context, user []User) (ImplResponse, error) { + // TODO - update CreateUsersWithArrayInput with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(0, {}) or use other options such as http.Ok ... + //return Response(0, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("CreateUsersWithArrayInput method not implemented") +} + +// CreateUsersWithListInput - Creates list of users with given input array +func (s *UserApiService) CreateUsersWithListInput(ctx context.Context, user []User) (ImplResponse, error) { + // TODO - update CreateUsersWithListInput with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(0, {}) or use other options such as http.Ok ... + //return Response(0, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("CreateUsersWithListInput method not implemented") +} + +// DeleteUser - Delete user +func (s *UserApiService) DeleteUser(ctx context.Context, username string) (ImplResponse, error) { + // TODO - update DeleteUser with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("DeleteUser method not implemented") +} + +// GetUserByName - Get user by user name +func (s *UserApiService) GetUserByName(ctx context.Context, username string) (ImplResponse, error) { + // TODO - update GetUserByName with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, User{}) or use other options such as http.Ok ... + //return Response(200, User{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("GetUserByName method not implemented") +} + +// LoginUser - Logs user into the system +func (s *UserApiService) LoginUser(ctx context.Context, username string, password string) (ImplResponse, error) { + // TODO - update LoginUser with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(200, string{}) or use other options such as http.Ok ... + //return Response(200, string{}), nil + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("LoginUser method not implemented") +} + +// LogoutUser - Logs out current logged in user session +func (s *UserApiService) LogoutUser(ctx context.Context) (ImplResponse, error) { + // TODO - update LogoutUser with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(0, {}) or use other options such as http.Ok ... + //return Response(0, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("LogoutUser method not implemented") +} + +// UpdateUser - Updated user +func (s *UserApiService) UpdateUser(ctx context.Context, username string, user User) (ImplResponse, error) { + // TODO - update UpdateUser with the required logic for this service method. + // Add api_user_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation. + + //TODO: Uncomment the next line to return response Response(400, {}) or use other options such as http.Ok ... + //return Response(400, nil),nil + + //TODO: Uncomment the next line to return response Response(404, {}) or use other options such as http.Ok ... + //return Response(404, nil),nil + + return Response(http.StatusNotImplemented, nil), errors.New("UpdateUser method not implemented") +} + diff --git a/samples/server/petstore/go-server-required/go/error.go b/samples/server/petstore/go-server-required/go/error.go new file mode 100644 index 00000000000..2c0b010fe8d --- /dev/null +++ b/samples/server/petstore/go-server-required/go/error.go @@ -0,0 +1,62 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "errors" + "fmt" + "net/http" +) + +var ( + // ErrTypeAssertionError is thrown when type an interface does not match the asserted type + ErrTypeAssertionError = errors.New("unable to assert type") +) + +// ParsingError indicates that an error has occurred when parsing request parameters +type ParsingError struct { + Err error +} + +func (e *ParsingError) Unwrap() error { + return e.Err +} + +func (e *ParsingError) Error() string { + return e.Err.Error() +} + +// RequiredError indicates that an error has occurred when parsing request parameters +type RequiredError struct { + Field string +} + +func (e *RequiredError) Error() string { + return fmt.Sprintf("required field '%s' is zero value.", e.Field) +} + +// ErrorHandler defines the required method for handling error. You may implement it and inject this into a controller if +// you would like errors to be handled differently from the DefaultErrorHandler +type ErrorHandler func(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) + +// DefaultErrorHandler defines the default logic on how to handle errors from the controller. Any errors from parsing +// request params will return a StatusBadRequest. Otherwise, the error code originating from the servicer will be used. +func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, result *ImplResponse) { + if _, ok := err.(*ParsingError); ok { + // Handle parsing errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusBadRequest), map[string][]string{}, w) + } else if _, ok := err.(*RequiredError); ok { + // Handle missing required errors + EncodeJSONResponse(err.Error(), func(i int) *int { return &i }(http.StatusUnprocessableEntity), map[string][]string{}, w) + } else { + // Handle all other errors + EncodeJSONResponse(err.Error(), &result.Code, result.Headers, w) + } +} diff --git a/samples/server/petstore/go-server-required/go/helpers.go b/samples/server/petstore/go-server-required/go/helpers.go new file mode 100644 index 00000000000..ef41ca1c897 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/helpers.go @@ -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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "reflect" +) + +// Response return a ImplResponse struct filled +func Response(code int, body interface{}) ImplResponse { + return ImplResponse { + Code: code, + Headers: nil, + Body: body, + } +} + +// ResponseWithHeaders return a ImplResponse struct filled, including headers +func ResponseWithHeaders(code int, headers map[string][]string, body interface{}) ImplResponse { + return ImplResponse { + Code: code, + Headers: headers, + Body: body, + } +} + +// IsZeroValue checks if the val is the zero-ed value. +func IsZeroValue(val interface{}) bool { + return val == nil || reflect.DeepEqual(val, reflect.Zero(reflect.TypeOf(val)).Interface()) +} + +// AssertInterfaceRequired recursively checks each struct in a slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseInterfaceRequired(obj interface{}, callback func(interface{}) error) error { + return AssertRecurseValueRequired(reflect.ValueOf(obj), callback) +} + +// AssertNestedValueRequired checks each struct in the nested slice against the callback. +// This method traverse nested slices in a preorder fashion. +func AssertRecurseValueRequired(value reflect.Value, callback func(interface{}) error) error { + switch value.Kind() { + // If it is a struct we check using callback + case reflect.Struct: + if err := callback(value.Interface()); err != nil { + return err + } + + // If it is a slice we continue recursion + case reflect.Slice: + for i := 0; i < value.Len(); i += 1 { + if err := AssertRecurseValueRequired(value.Index(i), callback); err != nil { + return err + } + } + } + return nil +} diff --git a/samples/server/petstore/go-server-required/go/impl.go b/samples/server/petstore/go-server-required/go/impl.go new file mode 100644 index 00000000000..1da96f41252 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/impl.go @@ -0,0 +1,17 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +//Implementation response defines an error code with the associated body +type ImplResponse struct { + Code int + Headers map[string][]string + Body interface{} +} diff --git a/samples/server/petstore/go-server-required/go/logger.go b/samples/server/petstore/go-server-required/go/logger.go new file mode 100644 index 00000000000..08cc0ea3f1d --- /dev/null +++ b/samples/server/petstore/go-server-required/go/logger.go @@ -0,0 +1,32 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "log" + "net/http" + "time" +) + +func Logger(inner http.Handler, name string) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + start := time.Now() + + inner.ServeHTTP(w, r) + + log.Printf( + "%s %s %s %s", + r.Method, + r.RequestURI, + name, + time.Since(start), + ) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_api_response.go b/samples/server/petstore/go-server-required/go/model_api_response.go new file mode 100644 index 00000000000..324cfbe0844 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_api_response.go @@ -0,0 +1,37 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// ApiResponse - Describes the result of uploading an image resource +type ApiResponse struct { + + Code int32 `json:"code,omitempty"` + + Type string `json:"type,omitempty"` + + Message string `json:"message,omitempty"` +} + +// AssertApiResponseRequired checks if the required fields are not zero-ed +func AssertApiResponseRequired(obj ApiResponse) error { + return nil +} + +// AssertRecurseApiResponseRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of ApiResponse (e.g. [][]ApiResponse), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseApiResponseRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aApiResponse, ok := obj.(ApiResponse) + if !ok { + return ErrTypeAssertionError + } + return AssertApiResponseRequired(aApiResponse) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_category.go b/samples/server/petstore/go-server-required/go/model_category.go new file mode 100644 index 00000000000..3ae01892a3f --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_category.go @@ -0,0 +1,35 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// Category - A category for a pet +type Category struct { + + Id int64 `json:"id,omitempty"` + + Name string `json:"name,omitempty"` +} + +// AssertCategoryRequired checks if the required fields are not zero-ed +func AssertCategoryRequired(obj Category) error { + return nil +} + +// AssertRecurseCategoryRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Category (e.g. [][]Category), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseCategoryRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aCategory, ok := obj.(Category) + if !ok { + return ErrTypeAssertionError + } + return AssertCategoryRequired(aCategory) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_order.go b/samples/server/petstore/go-server-required/go/model_order.go new file mode 100644 index 00000000000..f3441fa8c7b --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_order.go @@ -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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "time" +) + +// Order - An order for a pets from the pet store +type Order struct { + SpecialInfo + + Id int64 `json:"id,omitempty"` + + // Order Status + Status string `json:"status,omitempty"` + + Complete bool `json:"complete,omitempty"` + + Comment *string `json:"comment"` + + PetId int64 `json:"petId,omitempty"` + + Quantity int32 `json:"quantity,omitempty"` + + ShipDate time.Time `json:"shipDate,omitempty"` +} + +// AssertOrderRequired checks if the required fields are not zero-ed +func AssertOrderRequired(obj Order) error { + elements := map[string]interface{}{ + "comment": obj.Comment, + } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + + if err := AssertSpecialInfoRequired(obj.SpecialInfo); err != nil { + return err + } + + return nil +} + +// AssertRecurseOrderRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Order (e.g. [][]Order), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseOrderRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aOrder, ok := obj.(Order) + if !ok { + return ErrTypeAssertionError + } + return AssertOrderRequired(aOrder) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_order_info.go b/samples/server/petstore/go-server-required/go/model_order_info.go new file mode 100644 index 00000000000..3c6bb2704c9 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_order_info.go @@ -0,0 +1,41 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "time" +) + +// OrderInfo - An order info for a pets from the pet store +type OrderInfo struct { + + PetId int64 `json:"petId,omitempty"` + + Quantity int32 `json:"quantity,omitempty"` + + ShipDate time.Time `json:"shipDate,omitempty"` +} + +// AssertOrderInfoRequired checks if the required fields are not zero-ed +func AssertOrderInfoRequired(obj OrderInfo) error { + return nil +} + +// AssertRecurseOrderInfoRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of OrderInfo (e.g. [][]OrderInfo), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseOrderInfoRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aOrderInfo, ok := obj.(OrderInfo) + if !ok { + return ErrTypeAssertionError + } + return AssertOrderInfoRequired(aOrderInfo) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_pet.go b/samples/server/petstore/go-server-required/go/model_pet.go new file mode 100644 index 00000000000..5c71af290f6 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_pet.go @@ -0,0 +1,66 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// Pet - A pet for sale in the pet store +type Pet struct { + + Id int64 `json:"id,omitempty"` + + Category *Category `json:"category,omitempty"` + + Name string `json:"name"` + + PhotoUrls *[]string `json:"photoUrls"` + + Tags *[]Tag `json:"tags,omitempty"` + + // pet status in the store + Status string `json:"status,omitempty"` +} + +// AssertPetRequired checks if the required fields are not zero-ed +func AssertPetRequired(obj Pet) error { + elements := map[string]interface{}{ + "name": obj.Name, + "photoUrls": obj.PhotoUrls, + } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + + if obj.Category != nil { + if err := AssertCategoryRequired(*obj.Category); err != nil { + return err + } + } + if obj.Tags != nil { + for _, el := range *obj.Tags { + if err := AssertTagRequired(el); err != nil { + return err + } + } + } + return nil +} + +// AssertRecursePetRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Pet (e.g. [][]Pet), otherwise ErrTypeAssertionError is thrown. +func AssertRecursePetRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aPet, ok := obj.(Pet) + if !ok { + return ErrTypeAssertionError + } + return AssertPetRequired(aPet) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_special_info.go b/samples/server/petstore/go-server-required/go/model_special_info.go new file mode 100644 index 00000000000..73bea15959c --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_special_info.go @@ -0,0 +1,35 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// SpecialInfo - An order info for a pets from the pet store +type SpecialInfo struct { + + Promotion bool `json:"promotion,omitempty"` + + Type string `json:"type,omitempty"` +} + +// AssertSpecialInfoRequired checks if the required fields are not zero-ed +func AssertSpecialInfoRequired(obj SpecialInfo) error { + return nil +} + +// AssertRecurseSpecialInfoRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of SpecialInfo (e.g. [][]SpecialInfo), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseSpecialInfoRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aSpecialInfo, ok := obj.(SpecialInfo) + if !ok { + return ErrTypeAssertionError + } + return AssertSpecialInfoRequired(aSpecialInfo) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_tag.go b/samples/server/petstore/go-server-required/go/model_tag.go new file mode 100644 index 00000000000..0631ccc4866 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_tag.go @@ -0,0 +1,35 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// Tag - A tag for a pet +type Tag struct { + + Id int64 `json:"id,omitempty"` + + Name string `json:"name,omitempty"` +} + +// AssertTagRequired checks if the required fields are not zero-ed +func AssertTagRequired(obj Tag) error { + return nil +} + +// AssertRecurseTagRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of Tag (e.g. [][]Tag), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseTagRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aTag, ok := obj.(Tag) + if !ok { + return ErrTypeAssertionError + } + return AssertTagRequired(aTag) + }) +} diff --git a/samples/server/petstore/go-server-required/go/model_user.go b/samples/server/petstore/go-server-required/go/model_user.go new file mode 100644 index 00000000000..037b2f1ede6 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/model_user.go @@ -0,0 +1,68 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +// User - A User who is purchasing from the pet store +type User struct { + + Id int64 `json:"id,omitempty"` + + Username string `json:"username,omitempty"` + + FirstName string `json:"firstName,omitempty"` + + LastName string `json:"lastName,omitempty"` + + Email string `json:"email,omitempty"` + + Password string `json:"password,omitempty"` + + Phone *string `json:"phone,omitempty"` + + // User Status + UserStatus int32 `json:"userStatus,omitempty"` + + // An array 1-deep. + DeepSliceModel *[][][]Tag `json:"deepSliceModel"` + + // An array 1-deep. + DeepSliceMap [][]map[string]interface{} `json:"deepSliceMap,omitempty"` +} + +// AssertUserRequired checks if the required fields are not zero-ed +func AssertUserRequired(obj User) error { + elements := map[string]interface{}{ + "deepSliceModel": obj.DeepSliceModel, + } + for name, el := range elements { + if isZero := IsZeroValue(el); isZero { + return &RequiredError{Field: name} + } + } + + if obj.DeepSliceModel != nil { + if err := AssertRecurseTagRequired(*obj.DeepSliceModel); err != nil { + return err + } + } + return nil +} + +// AssertRecurseUserRequired recursively checks if required fields are not zero-ed in a nested slice. +// Accepts only nested slice of User (e.g. [][]User), otherwise ErrTypeAssertionError is thrown. +func AssertRecurseUserRequired(objSlice interface{}) error { + return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { + aUser, ok := obj.(User) + if !ok { + return ErrTypeAssertionError + } + return AssertUserRequired(aUser) + }) +} diff --git a/samples/server/petstore/go-server-required/go/routers.go b/samples/server/petstore/go-server-required/go/routers.go new file mode 100644 index 00000000000..3213d5dde23 --- /dev/null +++ b/samples/server/petstore/go-server-required/go/routers.go @@ -0,0 +1,221 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package petstoreserver + +import ( + "encoding/json" + "errors" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" + "io/ioutil" + "mime/multipart" + "net/http" + "os" + "strconv" + "strings" +) + +// A Route defines the parameters for an api endpoint +type Route struct { + Name string + Method string + Pattern string + HandlerFunc http.HandlerFunc +} + +// Routes are a collection of defined api endpoints +type Routes []Route + +// Router defines the required methods for retrieving api routes +type Router interface { + Routes() Routes +} + +const errMsgRequiredMissing = "required parameter is missing" + +// NewRouter creates a new router for any number of api routers +func NewRouter(routers ...Router) chi.Router { + router := chi.NewRouter() + router.Use(middleware.Logger) + for _, api := range routers { + for _, route := range api.Routes() { + var handler http.Handler + handler = route.HandlerFunc + router.Method(route.Method, route.Pattern, handler) + } + } + + return router +} + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { + wHeader := w.Header() + if headers != nil { + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + return json.NewEncoder(w).Encode(i) +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + fileBytes, err := ioutil.ReadAll(formFile) + if err != nil { + return nil, err + } + + file, err := ioutil.TempFile("", fileHeader.Filename) + if err != nil { + return nil, err + } + + defer file.Close() + + file.Write(fileBytes) + + return file, nil +} + +// parseInt64Parameter parses a string parameter to an int64. +func parseInt64Parameter(param string, required bool) (int64, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32Parameter parses a string parameter to an int32. +func parseInt32Parameter(param string, required bool) (int32, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + if err != nil { + return -1, err + } + + return int32(val), nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string) (bool, error) { + val, err := strconv.ParseBool(param) + if err != nil { + return false, err + } + + return bool(val), nil +} + +// parseInt64ArrayParameter parses a string parameter containing array of values to []int64. +func parseInt64ArrayParameter(param, delim string, required bool) ([]int64, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + ints := make([]int64, len(str)) + + for i, s := range str { + if v, err := strconv.ParseInt(s, 10, 64); err != nil { + return nil, err + } else { + ints[i] = v + } + } + + return ints, nil +} + +// parseInt32ArrayParameter parses a string parameter containing array of values to []int32. +func parseInt32ArrayParameter(param, delim string, required bool) ([]int32, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + ints := make([]int32, len(str)) + + for i, s := range str { + if v, err := strconv.ParseInt(s, 10, 32); err != nil { + return nil, err + } else { + ints[i] = int32(v) + } + } + + return ints, nil +} \ No newline at end of file diff --git a/samples/server/petstore/go-server-required/main.go b/samples/server/petstore/go-server-required/main.go new file mode 100644 index 00000000000..ddc5258297c --- /dev/null +++ b/samples/server/petstore/go-server-required/main.go @@ -0,0 +1,34 @@ +/* + * 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. + * + * API version: 1.0.0 + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package main + +import ( + "log" + "net/http" + + petstoreserver "github.com/GIT_USER_ID/GIT_REPO_ID/go" +) + +func main() { + log.Printf("Server started") + + PetApiService := petstoreserver.NewPetApiService() + PetApiController := petstoreserver.NewPetApiController(PetApiService) + + StoreApiService := petstoreserver.NewStoreApiService() + StoreApiController := petstoreserver.NewStoreApiController(StoreApiService) + + UserApiService := petstoreserver.NewUserApiService() + UserApiController := petstoreserver.NewUserApiController(UserApiService) + + router := petstoreserver.NewRouter(PetApiController, StoreApiController, UserApiController) + + log.Fatal(http.ListenAndServe(":8080", router)) +} From dbd80fbf8afc4eacd316bd080b945b3a92b9e0cf Mon Sep 17 00:00:00 2001 From: Ahmed Fwela <63286031+ahmednfwela@users.noreply.github.com> Date: Sat, 7 Aug 2021 15:53:36 +0200 Subject: [PATCH 44/72] [dart-dio-next] improve encodeCollectionQueryParameter to handle cases where collectionFormat is null (#10105) * improve encodeCollectionQueryParameter to handle cases where collectionFormat is null * updated samples --- .../serialization/built_value/query_param.mustache | 2 +- .../lib/src/api/fake_api.dart | 14 +++++++------- .../lib/src/api/pet_api.dart | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache index 3a27e77225e..06599a5ab4a 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache @@ -1 +1 @@ -{{#isContainer}}encodeCollectionQueryParameter<{{{baseType}}}>{{/isContainer}}{{^isContainer}}encodeQueryParameter{{/isContainer}}(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{dataType}}}){{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]), format: ListFormat.{{collectionFormat}}{{/isContainer}}) \ No newline at end of file +{{#isContainer}}encodeCollectionQueryParameter<{{{baseType}}}>{{/isContainer}}{{^isContainer}}encodeQueryParameter{{/isContainer}}(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{dataType}}}){{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]), {{#collectionFormat}}format: ListFormat.{{collectionFormat}},{{/collectionFormat}}{{/isContainer}}) \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart index 414c2255dc8..ad7e1f479fe 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart @@ -1096,7 +1096,7 @@ class FakeApi { ); final _queryParameters = { - if (enumQueryStringArray != null) r'enum_query_string_array': encodeCollectionQueryParameter(_serializers, enumQueryStringArray, const FullType(BuiltList, [FullType(String)]), format: ListFormat.multi), + if (enumQueryStringArray != null) r'enum_query_string_array': encodeCollectionQueryParameter(_serializers, enumQueryStringArray, const FullType(BuiltList, [FullType(String)]), format: ListFormat.multi,), if (enumQueryString != null) r'enum_query_string': encodeQueryParameter(_serializers, enumQueryString, const FullType(String)), if (enumQueryInteger != null) r'enum_query_integer': encodeQueryParameter(_serializers, enumQueryInteger, const FullType(int)), if (enumQueryDouble != null) r'enum_query_double': encodeQueryParameter(_serializers, enumQueryDouble, const FullType(double)), @@ -1106,7 +1106,7 @@ class FakeApi { try { _bodyData = { - if (enumFormStringArray != null) r'enum_form_string_array': encodeCollectionQueryParameter(_serializers, enumFormStringArray, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv), + if (enumFormStringArray != null) r'enum_form_string_array': encodeCollectionQueryParameter(_serializers, enumFormStringArray, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv,), if (enumFormString != null) r'enum_form_string': encodeQueryParameter(_serializers, enumFormString, const FullType(String)), }; @@ -1389,11 +1389,11 @@ class FakeApi { ); final _queryParameters = { - r'pipe': encodeCollectionQueryParameter(_serializers, pipe, const FullType(BuiltList, [FullType(String)]), format: ListFormat.pipes), - r'ioutil': encodeCollectionQueryParameter(_serializers, ioutil, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv), - r'http': encodeCollectionQueryParameter(_serializers, http, const FullType(BuiltList, [FullType(String)]), format: ListFormat.ssv), - r'url': encodeCollectionQueryParameter(_serializers, url, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv), - r'context': encodeCollectionQueryParameter(_serializers, context, const FullType(BuiltList, [FullType(String)]), format: ListFormat.multi), + r'pipe': encodeCollectionQueryParameter(_serializers, pipe, const FullType(BuiltList, [FullType(String)]), format: ListFormat.pipes,), + r'ioutil': encodeCollectionQueryParameter(_serializers, ioutil, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv,), + r'http': encodeCollectionQueryParameter(_serializers, http, const FullType(BuiltList, [FullType(String)]), format: ListFormat.ssv,), + r'url': encodeCollectionQueryParameter(_serializers, url, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv,), + r'context': encodeCollectionQueryParameter(_serializers, context, const FullType(BuiltList, [FullType(String)]), format: ListFormat.multi,), }; final _response = await _dio.request( diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart index 1dedc0456eb..50ab6268859 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart @@ -188,7 +188,7 @@ class PetApi { ); final _queryParameters = { - r'status': encodeCollectionQueryParameter(_serializers, status, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv), + r'status': encodeCollectionQueryParameter(_serializers, status, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv,), }; final _response = await _dio.request( @@ -273,7 +273,7 @@ class PetApi { ); final _queryParameters = { - r'tags': encodeCollectionQueryParameter(_serializers, tags, const FullType(BuiltSet, [FullType(String)]), format: ListFormat.csv), + r'tags': encodeCollectionQueryParameter(_serializers, tags, const FullType(BuiltSet, [FullType(String)]), format: ListFormat.csv,), }; final _response = await _dio.request( From 930643b7bcb6e75d41c3d60943d1975042bca169 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 7 Aug 2021 09:54:23 -0400 Subject: [PATCH 45/72] Add switches (authentication collections) to support files (#9884) * added authentication switches to support files * build samples * build samples * added documentation --- .../codegen/DefaultGenerator.java | 70 ++++++++++++------ .../codegen/utils/ProcessUtils.java | 72 +++++++++++++++++++ .../typescript-node/default/api/petApi.ts | 2 +- .../typescript-node/default/api/storeApi.ts | 5 ++ .../typescript-node/default/api/userApi.ts | 8 +++ .../typescript-node/npm/api/petApi.ts | 2 +- .../typescript-node/npm/api/storeApi.ts | 5 ++ .../typescript-node/npm/api/userApi.ts | 8 +++ .../erlang-server/src/openapi_pet_handler.erl | 4 +- .../src/openapi_store_handler.erl | 4 +- .../src/openapi_user_handler.erl | 4 +- .../php-slim4/.openapi-generator/FILES | 3 + 12 files changed, 159 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index d2e1bb4500d..404c49fd0d2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -630,6 +630,8 @@ public class DefaultGenerator implements Generator { allOperations.add(new HashMap<>(operation)); + addAuthenticationSwitches(operation); + for (String templateName : config.apiTemplateFiles().keySet()) { String filename = config.apiFilename(templateName, tag); File written = processTemplateToFile(operation, templateName, filename, generateApis, CodegenConstants.APIS); @@ -779,30 +781,10 @@ public class DefaultGenerator implements Generator { bundle.put("models", allModels); bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar)); bundle.put("modelPackage", config.modelPackage()); + bundle.put("library", config.getLibrary()); + // todo verify support and operation bundles have access to the common variables - Map securitySchemeMap = openAPI.getComponents() != null ? openAPI.getComponents().getSecuritySchemes() : null; - List authMethods = config.fromSecurity(securitySchemeMap); - if (authMethods != null && !authMethods.isEmpty()) { - bundle.put("authMethods", authMethods); - bundle.put("hasAuthMethods", true); - - if (ProcessUtils.hasOAuthMethods(authMethods)) { - bundle.put("hasOAuthMethods", true); - bundle.put("oauthMethods", ProcessUtils.getOAuthMethods(authMethods)); - } - if (ProcessUtils.hasHttpBearerMethods(authMethods)) { - bundle.put("hasHttpBearerMethods", true); - } - if (ProcessUtils.hasHttpSignatureMethods(authMethods)) { - bundle.put("hasHttpSignatureMethods", true); - } - if (ProcessUtils.hasHttpBasicMethods(authMethods)) { - bundle.put("hasHttpBasicMethods", true); - } - if (ProcessUtils.hasApiKeyMethods(authMethods)) { - bundle.put("hasApiKeyMethods", true); - } - } + addAuthenticationSwitches(bundle); List servers = config.fromServers(openAPI.getServers()); if (servers != null && !servers.isEmpty()) { @@ -830,6 +812,48 @@ public class DefaultGenerator implements Generator { return bundle; } + /** + * Add authentication methods to the given map + * This adds a boolean and a collection for each authentication type to the map. + *

                        + * Examples: + *

                        + * boolean hasOAuthMethods + *

                        + * List<CodegenSecurity> oauthMethods + * + * @param bundle the map which the booleans and collections will be added + */ + void addAuthenticationSwitches(Map bundle){ + Map securitySchemeMap = openAPI.getComponents() != null ? openAPI.getComponents().getSecuritySchemes() : null; + List authMethods = config.fromSecurity(securitySchemeMap); + if (authMethods != null && !authMethods.isEmpty()) { + bundle.put("authMethods", authMethods); + bundle.put("hasAuthMethods", true); + + if (ProcessUtils.hasOAuthMethods(authMethods)) { + bundle.put("hasOAuthMethods", true); + bundle.put("oauthMethods", ProcessUtils.getOAuthMethods(authMethods)); + } + if (ProcessUtils.hasHttpBearerMethods(authMethods)) { + bundle.put("hasHttpBearerMethods", true); + bundle.put("httpBearerMethods", ProcessUtils.getHttpBearerMethods(authMethods)); + } + if (ProcessUtils.hasHttpSignatureMethods(authMethods)) { + bundle.put("hasHttpSignatureMethods", true); + bundle.put("httpSignatureMethods", ProcessUtils.getHttpSignatureMethods(authMethods)); + } + if (ProcessUtils.hasHttpBasicMethods(authMethods)) { + bundle.put("hasHttpBasicMethods", true); + bundle.put("httpBasicMethods", ProcessUtils.getHttpBasicMethods(authMethods)); + } + if (ProcessUtils.hasApiKeyMethods(authMethods)) { + bundle.put("hasApiKeyMethods", true); + bundle.put("apiKeyMethods", ProcessUtils.getApiKeyMethods(authMethods)); + } + } + } + @Override public List generate() { if (openAPI == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java index 167c7d21124..9042eb92b39 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java @@ -63,6 +63,24 @@ public class ProcessUtils { return false; } + /** + * Returns a list of OAS Codegen security objects + * + * @param authMethods List of auth methods. + * @return A list of OAS Codegen security objects + */ + public static List getHttpBasicMethods(List authMethods) { + List httpBasicMethods = new ArrayList<>(); + + for (CodegenSecurity cs : authMethods) { + if (Boolean.TRUE.equals(cs.isBasicBasic)) { + httpBasicMethods.add(cs); + } + } + + return httpBasicMethods; + } + /** * Returns true if the specified OAS model has at least one operation with API keys. * @@ -80,6 +98,24 @@ public class ProcessUtils { return false; } + /** + * Returns a list of OAS Codegen security objects + * + * @param authMethods List of auth methods. + * @return A list of OAS Codegen security objects + */ + public static List getApiKeyMethods(List authMethods) { + List apiKeyMethods = new ArrayList<>(); + + for (CodegenSecurity cs : authMethods) { + if (Boolean.TRUE.equals(cs.isApiKey)) { + apiKeyMethods.add(cs); + } + } + + return apiKeyMethods; + } + /** * Returns true if the specified OAS model has at least one operation with the HTTP basic * security scheme. @@ -99,6 +135,24 @@ public class ProcessUtils { return false; } + /** + * Returns a list of OAS Codegen security objects + * + * @param authMethods List of auth methods. + * @return A list of OAS Codegen security objects + */ + public static List getHttpSignatureMethods(List authMethods) { + List httpSignatureMethods = new ArrayList<>(); + + for (CodegenSecurity cs : authMethods) { + if (Boolean.TRUE.equals(cs.isHttpSignature)) { + httpSignatureMethods.add(cs); + } + } + + return httpSignatureMethods; + } + /** * Returns true if the specified OAS model has at least one operation with HTTP bearer. * @@ -116,6 +170,24 @@ public class ProcessUtils { return false; } + /** + * Returns a list of Bearer Codegen security objects + * + * @param authMethods List of auth methods. + * @return A list of Bearer Codegen security objects + */ + public static List getHttpBearerMethods(List authMethods) { + List httpBearerMethods = new ArrayList<>(); + + for (CodegenSecurity cs : authMethods) { + if (Boolean.TRUE.equals(cs.isBasicBearer)) { + httpBearerMethods.add(cs); + } + } + + return httpBearerMethods; + } + /** * Returns true if the specified OAS model has at least one operation with OAuth. * diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts index 87004460f28..1dfd5447c6f 100644 --- a/samples/client/petstore/typescript-node/default/api/petApi.ts +++ b/samples/client/petstore/typescript-node/default/api/petApi.ts @@ -40,8 +40,8 @@ export class PetApi { protected authentications = { 'default': new VoidAuth(), - 'petstore_auth': new OAuth(), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts index 5935259f0b8..500c6325664 100644 --- a/samples/client/petstore/typescript-node/default/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts @@ -40,6 +40,7 @@ export class StoreApi { protected authentications = { 'default': new VoidAuth(), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; @@ -85,6 +86,10 @@ export class StoreApi { (this.authentications as any)[StoreApiApiKeys[key]].apiKey = value; } + set accessToken(token: string) { + this.authentications.petstore_auth.accessToken = token; + } + public addInterceptor(interceptor: Interceptor) { this.interceptors.push(interceptor); } diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts index ab4675de90a..3a29f079eaf 100644 --- a/samples/client/petstore/typescript-node/default/api/userApi.ts +++ b/samples/client/petstore/typescript-node/default/api/userApi.ts @@ -18,6 +18,7 @@ import http from 'http'; import { User } from '../model/user'; import { ObjectSerializer, Authentication, VoidAuth, Interceptor } from '../model/models'; +import { HttpBasicAuth, HttpBearerAuth, ApiKeyAuth, OAuth } from '../model/models'; import { HttpError, RequestFile } from './apis'; @@ -28,6 +29,7 @@ let defaultBasePath = 'http://petstore.swagger.io/v2'; // =============================================== export enum UserApiApiKeys { + api_key, } export class UserApi { @@ -37,6 +39,8 @@ export class UserApi { protected authentications = { 'default': new VoidAuth(), + 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; @@ -82,6 +86,10 @@ export class UserApi { (this.authentications as any)[UserApiApiKeys[key]].apiKey = value; } + set accessToken(token: string) { + this.authentications.petstore_auth.accessToken = token; + } + public addInterceptor(interceptor: Interceptor) { this.interceptors.push(interceptor); } diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts index 87004460f28..1dfd5447c6f 100644 --- a/samples/client/petstore/typescript-node/npm/api/petApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts @@ -40,8 +40,8 @@ export class PetApi { protected authentications = { 'default': new VoidAuth(), - 'petstore_auth': new OAuth(), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts index 5935259f0b8..500c6325664 100644 --- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts @@ -40,6 +40,7 @@ export class StoreApi { protected authentications = { 'default': new VoidAuth(), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; @@ -85,6 +86,10 @@ export class StoreApi { (this.authentications as any)[StoreApiApiKeys[key]].apiKey = value; } + set accessToken(token: string) { + this.authentications.petstore_auth.accessToken = token; + } + public addInterceptor(interceptor: Interceptor) { this.interceptors.push(interceptor); } diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts index ab4675de90a..3a29f079eaf 100644 --- a/samples/client/petstore/typescript-node/npm/api/userApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts @@ -18,6 +18,7 @@ import http from 'http'; import { User } from '../model/user'; import { ObjectSerializer, Authentication, VoidAuth, Interceptor } from '../model/models'; +import { HttpBasicAuth, HttpBearerAuth, ApiKeyAuth, OAuth } from '../model/models'; import { HttpError, RequestFile } from './apis'; @@ -28,6 +29,7 @@ let defaultBasePath = 'http://petstore.swagger.io/v2'; // =============================================== export enum UserApiApiKeys { + api_key, } export class UserApi { @@ -37,6 +39,8 @@ export class UserApi { protected authentications = { 'default': new VoidAuth(), + 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), } protected interceptors: Interceptor[] = []; @@ -82,6 +86,10 @@ export class UserApi { (this.authentications as any)[UserApiApiKeys[key]].apiKey = value; } + set accessToken(token: string) { + this.authentications.petstore_auth.accessToken = token; + } + public addInterceptor(interceptor: Interceptor) { this.interceptors.push(interceptor); } diff --git a/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl b/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl index a204918cc77..dc72a63c5d2 100644 --- a/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl +++ b/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl @@ -274,7 +274,9 @@ is_authorized( {false, AuthHeader, Req} -> {{false, AuthHeader}, Req, State} end; is_authorized(Req, State) -> - {true, Req, State}. + {{false, <<"">>}, Req, State}. +is_authorized(Req, State) -> + {{false, <<"">>}, Req, State}. -spec content_types_accepted(Req :: cowboy_req:req(), State :: state()) -> { diff --git a/samples/server/petstore/erlang-server/src/openapi_store_handler.erl b/samples/server/petstore/erlang-server/src/openapi_store_handler.erl index 1bc9cd38002..09245deb509 100644 --- a/samples/server/petstore/erlang-server/src/openapi_store_handler.erl +++ b/samples/server/petstore/erlang-server/src/openapi_store_handler.erl @@ -109,7 +109,9 @@ is_authorized( {false, AuthHeader, Req} -> {{false, AuthHeader}, Req, State} end; is_authorized(Req, State) -> - {true, Req, State}. + {{false, <<"">>}, Req, State}. +is_authorized(Req, State) -> + {{false, <<"">>}, Req, State}. -spec content_types_accepted(Req :: cowboy_req:req(), State :: state()) -> { diff --git a/samples/server/petstore/erlang-server/src/openapi_user_handler.erl b/samples/server/petstore/erlang-server/src/openapi_user_handler.erl index d466e7f5709..aad43103ac6 100644 --- a/samples/server/petstore/erlang-server/src/openapi_user_handler.erl +++ b/samples/server/petstore/erlang-server/src/openapi_user_handler.erl @@ -236,7 +236,9 @@ is_authorized( {false, AuthHeader, Req} -> {{false, AuthHeader}, Req, State} end; is_authorized(Req, State) -> - {true, Req, State}. + {{false, <<"">>}, Req, State}. +is_authorized(Req, State) -> + {{false, <<"">>}, Req, State}. -spec content_types_accepted(Req :: cowboy_req:req(), State :: state()) -> { diff --git a/samples/server/petstore/php-slim4/.openapi-generator/FILES b/samples/server/petstore/php-slim4/.openapi-generator/FILES index 463e80a1257..6d7926cf510 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/FILES +++ b/samples/server/petstore/php-slim4/.openapi-generator/FILES @@ -25,6 +25,9 @@ lib/Auth/AbstractAuthenticator.php lib/Auth/AbstractAuthenticator.php lib/Auth/AbstractAuthenticator.php lib/Auth/AbstractAuthenticator.php +lib/Auth/AbstractAuthenticator.php +lib/Auth/AbstractAuthenticator.php +lib/Auth/AbstractAuthenticator.php lib/BaseModel.php lib/Middleware/JsonBodyParserMiddleware.php lib/Model/ApiResponse.php From cb71ae95a64bbc4edbac56505c9ecfd58d60db19 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 7 Aug 2021 07:52:10 -0700 Subject: [PATCH 46/72] Feat adds has discriminator with non empty mapping (#9667) * Adds hasDiscriminatorWithNonEmptyMapping getter and setter * Removes venv * Adds hasDiscriminatorWithNonEmptyMapping to CodegenModel * Removes python-experimental folder * Adds hasDiscriminatorWithNonEmptyMapping to CodegenProperty * Adds hasDiscriminatorWithNonEmptyMapping to CodegenParameter * Adds hasDiscriminatorWithNonEmptyMapping to CodegenResponse * Sets hasDiscriminatorWithNonEmptyMapping in codegenModels * Samples updated * Adds getHasDiscriminatorWithNonEmptyMappin checks in existing discriminator tests --- .../org/openapitools/codegen/CodegenModel.java | 16 +++++++++++++++- .../openapitools/codegen/CodegenParameter.java | 14 +++++++++++++- .../openapitools/codegen/CodegenProperty.java | 14 +++++++++++++- .../openapitools/codegen/CodegenResponse.java | 14 +++++++++++++- .../openapitools/codegen/DefaultCodegen.java | 6 +++--- .../IJsonSchemaValidationProperties.java | 8 +++++++- .../codegen/DefaultCodegenTest.java | 12 +++++++++++- .../petstore/python-experimental/.coverage | Bin 94208 -> 0 bytes .../handler/PathHandlerInterface.java | 4 ++-- 9 files changed, 77 insertions(+), 11 deletions(-) delete mode 100644 samples/openapi3/client/petstore/python-experimental/.coverage diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index a441659434a..8d825dc545a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -155,6 +155,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { private CodegenProperty additionalProperties; private boolean isModel; private boolean hasRequiredVars; + private boolean hasDiscriminatorWithNonEmptyMapping; public String getAdditionalPropertiesType() { return additionalPropertiesType; @@ -316,6 +317,9 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public void setDiscriminator(CodegenDiscriminator discriminator) { this.discriminator = discriminator; + if (discriminator instanceof CodegenDiscriminator && !discriminator.getMappedModels().isEmpty()) { + this.hasDiscriminatorWithNonEmptyMapping = true; + } } /** @@ -768,6 +772,14 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.hasRequired = hasRequired; } + @Override + public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; }; + + @Override + public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { + this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -801,6 +813,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { hasOnlyReadOnly == that.hasOnlyReadOnly && isNull == that.isNull && hasValidation == that.hasValidation && + hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getUniqueItems() == that.getUniqueItems() && getExclusiveMinimum() == that.getExclusiveMinimum() && @@ -874,7 +887,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(), getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel(), - getAdditionalPropertiesIsAnyType()); + getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping); } @Override @@ -964,6 +977,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", isNull='").append(isNull); sb.append(", hasValidation='").append(hasValidation); sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType()); + sb.append(", getHasDiscriminatorWithNonEmptyMapping=").append(hasDiscriminatorWithNonEmptyMapping); sb.append('}'); return sb.toString(); } 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 2266cc48f31..8f512e4cec7 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 @@ -106,6 +106,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { private Integer minProperties; public boolean isNull; private boolean hasRequired; + private boolean hasDiscriminatorWithNonEmptyMapping; public CodegenParameter copy() { CodegenParameter output = new CodegenParameter(); @@ -156,6 +157,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.setAdditionalPropertiesIsAnyType(this.getAdditionalPropertiesIsAnyType()); output.setHasVars(this.hasVars); output.setHasRequired(this.hasRequired); + output.setHasDiscriminatorWithNonEmptyMapping(this.hasDiscriminatorWithNonEmptyMapping); if (this._enum != null) { output._enum = new ArrayList(this._enum); @@ -213,7 +215,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger, hasDiscriminatorWithNonEmptyMapping); } @Override @@ -261,6 +263,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { isDeprecated == that.isDeprecated && required == that.required && isNull == that.isNull && + hasDiscriminatorWithNonEmptyMapping && that.getHasDiscriminatorWithNonEmptyMapping() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getHasVars() == that.getHasVars() && getHasRequired() == that.getHasRequired() && @@ -386,6 +389,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType); sb.append(", getHasVars=").append(hasVars); sb.append(", getHasRequired=").append(hasRequired); + sb.append(", getHasDiscriminatorWithNonEmptyMapping=").append(hasDiscriminatorWithNonEmptyMapping); sb.append('}'); return sb.toString(); } @@ -667,5 +671,13 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public void setHasRequired(boolean hasRequired) { this.hasRequired = hasRequired; } + + @Override + public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; }; + + @Override + public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { + this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; + } } 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 4ccbb8c3a9d..8fe4c34ebb1 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 @@ -190,6 +190,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti private boolean additionalPropertiesIsAnyType; private boolean hasVars; private boolean hasRequired; + private boolean hasDiscriminatorWithNonEmptyMapping; public String getBaseName() { return baseName; @@ -754,6 +755,14 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.hasRequired = hasRequired; } + @Override + public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; }; + + @Override + public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { + this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenProperty{"); @@ -848,6 +857,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType()); sb.append(", getHasVars=").append(getHasVars()); sb.append(", getHasRequired=").append(getHasRequired()); + sb.append(", getHasDiscriminatorWithNonEmptyMapping=").append(hasDiscriminatorWithNonEmptyMapping); sb.append('}'); return sb.toString(); } @@ -899,6 +909,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isXmlAttribute == that.isXmlAttribute && isXmlWrapped == that.isXmlWrapped && isNull == that.isNull && + hasDiscriminatorWithNonEmptyMapping == that.hasDiscriminatorWithNonEmptyMapping && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getHasVars() == that.getHasVars() && getHasRequired() ==that.getHasRequired() && @@ -963,6 +974,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, - xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired); + xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, + hasDiscriminatorWithNonEmptyMapping); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 22c85170bbb..022933ebe4c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -84,6 +84,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { private boolean additionalPropertiesIsAnyType; private boolean hasVars; private boolean hasRequired; + private boolean hasDiscriminatorWithNonEmptyMapping; @Override public int hashCode() { @@ -94,7 +95,8 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { vars, requiredVars, isNull, hasValidation, isShort, isUnboundedInteger, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(), - is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars, hasRequired); + is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars, hasRequired, + hasDiscriminatorWithNonEmptyMapping); } @Override @@ -138,6 +140,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { is3xx == that.is3xx && is4xx == that.is4xx && is5xx == that.is5xx && + hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getHasVars() == that.getHasVars() && getHasRequired() == that.getHasRequired() && @@ -478,6 +481,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType); sb.append(", getHasVars=").append(hasVars); sb.append(", getHasRequired=").append(hasRequired); + sb.append(", getHasDiscriminatorWithNonEmptyMapping=").append(hasDiscriminatorWithNonEmptyMapping); sb.append('}'); return sb.toString(); } @@ -534,4 +538,12 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public void setHasVars(boolean hasVars) { this.hasVars = hasVars; } + + @Override + public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; }; + + @Override + public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { + this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; + } } 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 cb8f6ed8d88..fc98a969d14 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 @@ -2393,7 +2393,7 @@ public class DefaultCodegen implements CodegenConfig { } m.isAlias = (typeAliases.containsKey(name) || isAliasOfSimpleTypes(schema)); // check if the unaliased schema is an alias of simple OAS types - m.discriminator = createDiscriminator(name, schema, this.openAPI); + m.setDiscriminator(createDiscriminator(name, schema, this.openAPI)); if (!this.getLegacyDiscriminatorBehavior()) { m.addDiscriminatorMappedModelsImports(); } @@ -2453,7 +2453,7 @@ public class DefaultCodegen implements CodegenConfig { for (Schema innerSchema : composed.getAllOf()) { // TODO need to work with anyOf, oneOf as well if (m.discriminator == null && innerSchema.getDiscriminator() != null) { LOGGER.debug("discriminator is set to null (not correctly set earlier): {}", name); - m.discriminator = createDiscriminator(name, innerSchema, this.openAPI); + m.setDiscriminator(createDiscriminator(name, innerSchema, this.openAPI)); if (!this.getLegacyDiscriminatorBehavior()) { m.addDiscriminatorMappedModelsImports(); } @@ -6663,7 +6663,7 @@ public class DefaultCodegen implements CodegenConfig { CodegenModel cm = new CodegenModel(); - cm.discriminator = createDiscriminator("", cs, openAPI); + cm.setDiscriminator(createDiscriminator("", cs, openAPI)); if (!this.getLegacyDiscriminatorBehavior()) { cm.addDiscriminatorMappedModelsImports(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index bf078ab792d..ffb195c4a5b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -122,4 +122,10 @@ public interface IJsonSchemaValidationProperties { boolean getHasRequired(); void setHasRequired(boolean hasRequired); -} + + // discriminators are only supported in request bodies and response payloads per OpenApi + boolean getHasDiscriminatorWithNonEmptyMapping(); + + // discriminators are only supported in request bodies and response payloads per OpenApi + void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping); +} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 4f6e36a62de..a007bb56fee 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -887,6 +887,7 @@ public class DefaultCodegenTest { test.getMappedModels().add(new CodegenDiscriminator.MappedModel("Cat", "Cat")); test.getMappedModels().add(new CodegenDiscriminator.MappedModel("BigCat", "BigCat")); Assert.assertEquals(discriminator, test); + Assert.assertEquals(animalModel.getHasDiscriminatorWithNonEmptyMapping(), true); } @Test @@ -905,6 +906,7 @@ public class DefaultCodegenTest { codegen.setOpenAPI(openAPI); CodegenModel personModel = codegen.fromModel("Person", person); verifyPersonDiscriminator(personModel.discriminator); + Assert.assertEquals(personModel.getHasDiscriminatorWithNonEmptyMapping(), true); } @Test @@ -916,6 +918,7 @@ public class DefaultCodegenTest { codegen.setOpenAPI(openAPI); CodegenModel childModel = codegen.fromModel("Child", child); Assert.assertEquals(childModel.parentSchema, "Person"); + Assert.assertEquals(childModel.getHasDiscriminatorWithNonEmptyMapping(), false); } @Test @@ -989,6 +992,7 @@ public class DefaultCodegenTest { Schema leafSc = openAPI.getComponents().getSchemas().get(leafModelName); CodegenModel leafCm = codegen.fromModel(leafModelName, leafSc); Assert.assertEquals(leafCm.discriminator, emptyMapDisc); + Assert.assertEquals(leafCm.getHasDiscriminatorWithNonEmptyMapping(), false); } // the Pet discriminator map contains all animals + Reptile (children + grandchildren) @@ -1004,6 +1008,7 @@ public class DefaultCodegenTest { modelName = "Pet"; sc = openAPI.getComponents().getSchemas().get(modelName); CodegenModel pet = codegen.fromModel(modelName, sc); + Assert.assertEquals(pet.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(pet.discriminator, petDisc); // the Reptile discriminator contains both reptiles @@ -1019,6 +1024,7 @@ public class DefaultCodegenTest { modelName = "Reptile"; sc = openAPI.getComponents().getSchemas().get(modelName); CodegenModel reptile = codegen.fromModel(modelName, sc); + Assert.assertEquals(reptile.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(reptile.discriminator, reptileDisc); // the MyPets discriminator contains Cat and Lizard @@ -1034,12 +1040,14 @@ public class DefaultCodegenTest { modelName = "MyPets"; sc = openAPI.getComponents().getSchemas().get(modelName); CodegenModel myPets = codegen.fromModel(modelName, sc); + Assert.assertEquals(myPets.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(myPets.discriminator, myPetDisc); // the MyPetsNoDisc discriminator is created because all oneOf classes have the same discriminator modelName = "MyPetsNoDisc"; sc = openAPI.getComponents().getSchemas().get(modelName); CodegenModel myPetsNoDisc = codegen.fromModel(modelName, sc); + Assert.assertEquals(myPetsNoDisc.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(myPetsNoDisc.discriminator, myPetDisc); CodegenModel cm; @@ -1052,6 +1060,7 @@ public class DefaultCodegenTest { hs.add(new CodegenDiscriminator.MappedModel("b", codegen.toModelName("B"))); hs.add(new CodegenDiscriminator.MappedModel("B", codegen.toModelName("B"))); hs.add(new CodegenDiscriminator.MappedModel("C", codegen.toModelName("C"))); + Assert.assertEquals(cm.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(cm.discriminator.getMappedModels(), hs); // the mapping in b is in B @@ -1061,7 +1070,7 @@ public class DefaultCodegenTest { hs.clear(); hs.add(new CodegenDiscriminator.MappedModel("b", codegen.toModelName("B"))); hs.add(new CodegenDiscriminator.MappedModel("C", codegen.toModelName("C"))); - + Assert.assertEquals(cm.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(cm.discriminator.getMappedModels(), hs); // the mapping in b is in C @@ -1070,6 +1079,7 @@ public class DefaultCodegenTest { cm = codegen.fromModel(modelName, sc); hs.clear(); hs.add(new CodegenDiscriminator.MappedModel("b", codegen.toModelName("B"))); + Assert.assertEquals(cm.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(cm.discriminator.getMappedModels(), hs); } diff --git a/samples/openapi3/client/petstore/python-experimental/.coverage b/samples/openapi3/client/petstore/python-experimental/.coverage deleted file mode 100644 index 9e8563e13450422ac584dd73f6572a2d6b14b7cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94208 zcmeHw34B!Lx%ZiwGy7SxkUb$oSVADlB!qoS2(p8$0R&-kGIJ&wG8?mm1aBc{?A0#z zyIQ~2rM2R{-q!03Rwt3bMGtG0M;FV(t`UfXKb3NF3i2a@|d@0pp*gv3w3ANHl* zGmz(*=e+MZ^FRN0-#2eu>x;<_ZzvLwVvZ&zhtcVn7Kejj7%Ti0!C&fQhA(W&0IkdT zKGs(&Q@`d$UfjxXrmr*NZhpI1$NekswEvFlvEFR|j(LyO4-VQ#V?bj-V?bj-V}LNA zY~;*EB_+DV=VDTaUyem2w;WL=zjV{GC0mv`wk&B~yUd|pb4;~4;8R!USmKC;_Bq0G z#NqY%Wrr{5@wug#FWBjbb;&8;@u=*<5)ZCHnTH)T;Hgi#azV3RN zypt4h!+(3$+rWk4S6StS2f0HL52EjgNI`d(9IbUo={IzT0B3JZecMPV;EaVFeqWHh zW-#iD`9eX5+$+1|G1)Wf3)UiOsSl8s`8M#Zc6_0B_0HsPWw0}R^C)*Fy(e$>0=Qr( zMeFd5_|tGR!5oYSI)L&$@jw^@2kuaRI2Ib~&av)|g_1A(vBPGRupEBhtl&&hjv=bv z6%YFM#^rS2*E)vptR=4z4AnaDB_IY&wwsFPE~>25UB8z^6r{)1;fqDnU#wY?CVhE~sDtif#~Vx~*^vZOk>BqKc}bGNyB%ua zKy1!TGtLwlQUnv4Bb4+ANU6p)1Pd4(9sW>9c3dMdCMrV$fxIB)%^MH8F{woH9o(TF zIU;q+^+{JXTc910AnG()O-0Kp$BH`XDBx;Lf3+zkCUa3)nJ!@^(I^>ONoCH8LaC4( zB^ymS1!O52kEAk^kIE!dcMRu}sWg&wf!C=sn~Ii{jrBT7f3C*l7mH$M%|!(TIz>$p zm@na}SHN-n4Z}_3;{FLFS?vkRI`9!N79ifn4mV#=L03KIG;ir622l?rX3!~=YXGHt( z8J#`V1WKw*!Q6cdq_tGCf-ix96!avEDJ*@}r$UyGX%c@&%{$;mM>V9yD5T60&rCfu z>53Uu>iP9ypaP#7kUVNC$FRtF;=V5VqQ|L)&=pclj`;$z1HBM1BtGqvq7HXN21h7D zYpM+&75W%Ru11vDO15A{Myb@9i>6Q4De+_)RI?XX6w2~|l!Bc!^;vOagyV2DSr7Rv zRB|$-2XdD|2b$_HV4kLiV28>=%2%?AW2@l-rA|D@z<=$dF`zM^F`zM^F`zM^F`zM^ zF`zM^F`zM^F`zN<*<-+<)9cLG{%6I>Fg7o)7n|UV_R$#77|L{%gQ1`arwPnxn9*3*Fr#k9Tt`FW{28<7H_qkthO+$R zAp5NPnK1s(RwSBIvmgkoe?PzfN6ftP*@I1VP9RR z9E5pDu~5Vrl>%YE98I}2Io*Dr9E>@`ax4n&vNPNl>k0+y0d3!(=(8mq2#RM*wPq=H4MJ6-TY)w^sErmXlJBR(g-FTO6G{GS@c+IwpZXbfl! zXbfl!Xbfl!Xbfl!Xbfl!Xbfl!{CzRN87g$Cz6#c2D9~Y7g~4tp(Q^mapqHPt0y zgqLH*x9}AU#dG3+iSLMSaXaiM>}zaCZ8NNQTT3k0n2(!VO+PR>jdvM~+3O7#3?cn% z`klHT>#CTWE;%=fP|h-m34fc8lFYskXCUN}{Z1(ok@{RAuSQL$GEl;_^z} zup&3?LqMi+l$b$4E|)Lpi@96~#GVg8%BTgA6of_aexN22AhhIBq9vI-6Eq0KoC`qm z>CxixKsqAjgDnS;lu$#0<&?|qmsBt{B7oUO4UFXRkc|f*#=y7+3`xX%a@4iY7wdxM zp(6{{G6AqIxXiGonY8eLu7Dc4fE0G&zzxX)IDkSg3xH++usKv3jnxil=oRZEzNeV6 z*#HZ@w5P`D6c~$@YK+M&G;|h#Vx|yzqp%$c)B_>b9y9|40|f}_io4MS2&mQhT=AIC zPYMXL5pd8bs$l;Fudg!>BgwFg9y1b_1tdI;FzI#6VY1Bzz&Kz46gmnhpu{HmDXXVM z1Jv!HsKx<&3=O>wU|9clJV0B0TmVGgCJ?!EK;)F`h1VIDuZHhTkr?8ug*N^d{M+_5 z*y>l?{F$wN+fl;>bF11fz`Z2I?I-ZYOZrhnHZg%lyN=6^mlT1GVg^Aro4$frn4y7`~0*x5u0JtSGp{~To+ zo7hGV%qMC7i%L10Sa7*vO*Q`o#mXiM=%LGK{_~Wxfb8Z!N4Z$fZ2sFRr@gG^zm0N? z$!Pvt6+N3U(}=vo&3}u+un7YV45{|N`4U$8pov2}zmoUHeSX-8E&_e4v4~F!cEaeE z~Z!-?0(kI?qb)oOV~QL!f?CcOYpMVM`M68135jc&RW%DX@?Cs3@yi>2{#FGxH3Mj zUTF^s3KKKxtO+J&X*YOI>yvoT?z`{)?!GBWYv9;UdDqiTx}CWi6y>P8`uj;3P3!@cAtDWKa5Lo3QVjb%AazS(qs$SV;0eC&d z7P#p3UX0`?F&{nrwYERro-~*XFYgIvyus;HTd(?U#LM~dp?>wDbNO!k#cpDCFa~}P zntN2o_9oE>ro%_fqq>H{>3kQucctAs(YUx z_+jHg-Q4A$8ay!SJMxcv(AP~gRL=PMw1zWyYh z9Lu!7_{fF_Jd#JoYMZ^X{$q zF#P<(shx7$ky|=b;d}Z>=xc3%-5pFljyZkg)U^BFIPwyg-wuGMwjUFwwq`_*6-Urj6{w-cRqs!kUB z4s_aqR=cD4DlleTr8+T;`-aBrO1wY!{+}Ck{C03D->$kmq!+elW1-Fz}nv+>B;R12dc7gytsI72?E3FdZ9-c~r-pwQ(EZLg@y) z08yA*kJkF6#b1f{UP&yB(Cg4~oodeG*P`QEVhuDk@oUgrlQj2ntI_XjG#NvKxC$)C zDzt#-_EVy`5-+SI&KNc4i!1QLiu8pe+;V)ta`gf2+%mM5sg|SU3b1Bgk)4!YdEnvi z{?RKg#pf(lJu(ABvvXSELRBkXXg}n7^s&dH!Vh@##Fm8+$NzEaLI8BW`Pw2i7D57s zDE^I94wP*T1tBB*C5isv`y;G@V-MUv?YAk9Y9^4%03kbsEaBr>k0Cj!1d*MqGH1_x z_u+eYWo4upo&n$KBSQyWAHH_t_7nF;?}g8Wp$kLru1&rs+z7^-CH_Me|{!!E?k*1H|eGSohSRx=yT`5wMlc5*GR6FGaGN5O)e#L{ZB9k zaTZ*0%u0G{7_85oiFeJ!3j+r^=9Oz+U&J-RrP3zi$6yg>;2krPcNCv4;2YsWc_Utc zNMR^y0JEVXGl~wL+`9E^-JBC2<3xY$OgUGNR(;aq>+l(MA6aDtV}tM zN5}DK4KT$#SAmWds^b7xj#fEZbGg%e8G0>K-C8)V6dg;^?APh}5_Bw49U;do26KF| zYTj7!KI}XMo{Lm_kSj#1P_-;21z^oA$P65YM9fD^U>_WvRT!t|^6`dzyurdX zm4_DOUjxsdGjO@+o~u5P<#WI)&q1plGD==VQzYIS`^};NrbAHuGT#innZv_{DjqLD zT=_%HJG+d7D|5M|7v|Ze)z`ef_WJR)=iYjDiCAVwM?3M(G%(D5?{$lsmUdqEs~Z}h zC>Cw_a9i?O4IN!3D_jt)`q>uHK?{5O;Gr#Fbyqg2$u&n+EueBxz;v5tveDL)5hKCN{I*X|p z8vk=H*95k1N}hvp=b`M}Vbp?v<_+qa)PHgrtK{4jJ(cVOrT=RP>q__Lwoi-tb@ze8tQhtA}b zG8=yM`v=dQe0iw-!l@Sqm>lpMtk?hX*z9)Kt1tYv_laBHS>N38@>gFtb?S!BW5=4l z#Xo=OI@g?>YybU2S6^T2cd+)uKYwt1=qE!rGq1ll zZ?ONMY3|^iQ)Uk|8_vIX@Pp4Gxj=dB9bF;gP^pI6>w!wO3Y!cJVjzW#dbuCIp$PrJvzWvOkW*za|pW&DaMHYWV^@*?@V%_&C9;5UwE`iJlR`WtU6p7@K&^Hx<& z`eOg2oAmud5@Q%(xQ6zD_WoJ@Iy*qO7+8yi)f-#R9z1Zi(&D-HrIxSoMJzDkkF zni&(*zkl1R0p```hMFIJZ9$^{wtFhkv#I5!b<7nFCx#B9#V~`Fgc$s)@XU79I%dgg z-HiswOWNep&py_&Kph42fN$B<>J5i)+PY;$m@* z*dW%3RbrVqPUJE+#!5j_$T2Df+Fk} zqJm$Lh26q7VS}(rXcZO+Gle=~icl#O3%P<#F!1O3zw&SMuknNY3;c8Z)BI2QBm5)$ zgZw@GUHt9*&HN4gKk^6oeSDbr@g4k5eha^jU(Pr4bNNPo8b6UQ=L>j&hZ7FD54d-s zN8=CN%iIa>IJ~U((HPJe&=}Ad&=}Ad&=}Ad&=}Ad_`7Dn1nn$cPY+S?I8m_}QPC(- zkqA+H_YxHj6BP;(6$}y;2oUA>6V=^K)Sf*=`FuombrIFsNtD-1lq?hF@et*96V=f{ zlq3<=-cFRuMbz%yMD5x|)YVrLwR0y?J9ZFt)m21o-%ixFZA5L|N>p1LQCqeUwRtm9 zn>G=(aU)S1HW0ObJyBO)Nz}S^M6F#*)S5L!tzJ#ks#Qd-TuIc56+|sxPSmnxL|t(O zQA?K+)!Itbk|jj7v=G(YOw{7VL@ioG)WU^CEm%O*{P{%9n@7~#xkSyGL)7fqM9rE- z)XbSgH8l}6V+K);jYKsx5ao0dRbNk3T^&)iwM0#yPSmt%MAg&~HFYXc)zw5znL^a$ z$wW<>MAXEIL{(K0HDLl#4hK<{l|+pnPgF$(QRU@Cm6Z`yT1r$&2~owxL=_bgRai(= zK><U}0ibM$lQ9Mr+#}Q?>6J@gzWwjDzu@Gf86J;_HWrU3| zA$71UQ3eB1dOZuB0A&0hJ7lzv#(>6v#(>6v#(>6v#(>6v#(>6v#(>6v#(>7aXO{sS z|JU08pWX1)-b`aaV?bj-V?bj-V?bj-V?bj-V?bj-V?bj78Nl`bz5G2m|Npgx6txz$?NF z!f%A*!c)S}V2!|I!Xv`>g!_f>2>%T01a1{>7XFv;Md9|w&%*kF zC-@)nkMoE5hxrHKg|&~yfX0BvfX0BvfX0BvfX0BvfX0Bvz-7vSp%*r5H|#^vgCdS1 zh9Zh0f?_X&u>!?%6w6Rt zfnq6&RuoH6w4i84u^7c76bn%-KrtW1JQQnTk3yPOjajl(LCAqabvKBcaZS6bSf&oz75L4#Jz&b;?0F4i$)YMx{X5FGo`@ zO-}V_d3<*g5Kf2=U7=u|+#8l7z5twVD*4ln$c_{Lyi&L9A}2rxrGV^;Nu5zwz04|Kwf&_D9wayDL^wf$>tVMfduN3#E+8hnkDq@I53Wj1`P%F%+Jr__b9uQDQ z`W>g}*@V^VY=b6i)VU`fjroEde#zbaske19K-k!um{Q$DMt8q%BKtLAm;Orrw|pyi zn450D)o!yX)<0WUTW&L-G4C<`(lpEXps`BqVGV{J;SK#s=0@fzXo`F({}LvC_9mT! zVlC9`gSuYS-6aPkS4@t^ur)|6zNn>mhZKZ=kg6*c2b&nJ_5P{Hmt=KVXVNMX>h_w7&R$5jg5#;LqF?(<7A=%nzwViBJd>?GCq z`HG!QP;9_s!KwChK%nJNuDla4q!x%#XdZu@VJXw2rnqF2&p{cCCj_lwzaM%yfSo3V zWfS&GnB9Kt?lCoi0T@6rLn&kvPKqcXMX8O4jC=@iIh8UtF^@8?81ycV2CklVJc34Y zw96ItVF=byE=t^?KsXeYJ}F=#?d%K9~>GDo!>b(F@BoLhOmU7@;c| za%D%p=}HBgSVR}FU+#77jZ2*E~co5DtlxtV%Hd7(xVvuw&xJWh& zv`kfU*~Dauv8l`F_qf~=wBk}_Pc^khWwLUYf&}zTq1+1t#K@hY2o5w%rkt;5h0!Ev zj#(-p+EA`104ShlB4uhir0CwboGkJtP>#N&nu|?JAjVFu!zx*gi%9!mlm(E?#QFc_ z%uS4Vjqtt@ku^jL8_)Q*;)9Vx|yzqrT3d+O#-m1_%ZU5HNyZ7oq~& zo>Q#zx#BUOpWrYX0SAquYUK0;=oJ7YJdH5PoH26104QkmZNY3PY013THK-LJYVweG7>=d%tBrRlwRw-%(6iw7n_=0{P zjO?YR2)mL~!Z7cJV^ZnV9;4nBFkCj88$!^V@8`VZZ)){Yu>rV9~(!m#q1(lxzZa=1^nD7Y#+- zGOQp^Pt(pQx$-swwwlWb8x~>w1^`t_4^$9lK*7QqSdZU0i{M#*dEk+H8ygT$<&}Vk zUWVXH@CZ0HarV%mUUy<|`}Q8h}J^ z+C(NK47$A40Eb?V&?QC5J_k?=OE`y`?0BH$t)dDFcIOCs!V;Oqtxg(1rYtJ~6up{u zXTX*2u(YlKDD)a21V^ggWLOSZ=vB16p%4ZRy9`j!7!FeVDsizL!YH`{V9+T0u}koy z_k2;@8*Sipf#cQxD2Nq_CrfdnIp*L|O)Uii)$JDv<>QbAC>?Iou zkm1&%7C=X@?>jj=b7Wfpc{4QwGJ3700BoNm`4LF|VgNFoTII1zmi(~w11z(3cjF)d ztQJR9g^K_cy$aE2Yk$e^8H#BkrEp7UQ1FE$yafP+Ucwt~Icr8cY2183N3VrD8agD+ zJ`Z5g%R5O6fV93z?!?apH1yhSWEj~MiokYRe#{E+{J&!TB1XT+uv-69F(SMn?B;*X zFXsM@%eVL0-mq=69<`QRZh&5ZPSew-R^wqK3$p-T)!n7bVGd-q|CM|;QKS1rnF_-g zU7H81iirG!n)Qp1eeZYNpw$7PfkJE@iF z<&^hN8?*FUM0ph!2`iW1N2Xr2DS2$7nqG=0U}iKlV67vyd)XGHkxj@HG5LC7C3MEV zSkR7kjXse&l?XReUjLXeIhm)tfHz&KZKk$$sG1vnR2TB5|BtfqQWkUuf+>u?#S5hu>vJhr=A+Mvnd_4=8+J(H9 z@|KyIkRb7`QHt3_6V1do)(pKyWgMHBP7m4Wodb(0=b)o@xv!=SYSb?GRg~)n8C~ux zDX+QD>~dd0dF$TPFvKj%`;25S=Hk@x|3i$pPIy$PuVaYYQZ0oDa~^ z>z^DA9gCAI?!2ZQ@H#Cm^FY5nv=TBun%Hq>0qpEa?Gvm)93j7n2pq zRD&;jzb~w1M!b@nm}=ZjDQMK5kx;~=M%1ERfP-GqkQ`_q zZ74hEYCuM>Xh_& z9RSUu2PiapFFR%c>^6W#Z)Q}gcF%1E81$w+s!ffE9E(TrbOXiK25{)*(JGweNRpDf z1;A8Oi#-I)h>;|vVKZQo>0$chBS|>^KaRbdF)OA&nc9p$HO^q~7QMo+g<1SJ_APYU46r|O1mfzC67b~nNug_Ea2i!NH68!%j)Wb6M=?1A!W*wIV zS4ww6x+%|ER68L%XrmzgZS9n&C}ws3x#-rWovF^h-IUYx*qwj7lyWw)fL;YViHwx3 z7q9grEBtP%0W5ylB5ITV#IFYDWQ?Sk9Tli=Je3!f7jLpm$i?^fX0Bv zfX0BvfX0BvfX2Yz5d(^~7lxy#?RXK*JnULA?*lB9=5b~tG4=ow8uM<{&cOY0M+A>^ zR*Z3~IQDhHyg$TYiUAH9)3R_L5{}tmUory8ivkdO6KqolG-vf+DV7L;qPKxf3Ka5V z*b7kTOH0c%6ao`@GWM8ewq!>}Cj1>|5%^5a6I^eS4X+5?i&Qi2TT@}GZ5p;Q=kv9F)< rM9A#LzTK2(0gSesc6i#@9;JXy)KSbGMp=psk=;jmI@HMR|K|QTNzD)V diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java index 362ae244118..6becdb40cb1 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java @@ -539,10 +539,10 @@ public interface PathHandlerInterface { *

                        Response headers: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "integer", "format" : "int32" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "string", "format" : "date-time" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false}]

                        +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false}]

                        * *

                        Produces: [{mediaType=application/xml}, {mediaType=application/json}]

                        *

                        Returns: {@link String}

                        From 74e28a770909f41fed38b7fd3c98f1d9a1e21795 Mon Sep 17 00:00:00 2001 From: NouemanKHAL Date: Sat, 7 Aug 2021 23:27:13 +0200 Subject: [PATCH 47/72] [typescript] FIX: Generate documentation and examples #9413 (#9857) * generate docs for typescript * commit changed files * Fix NullPointerException on ComposedSchema * Fix merge issues --- bin/configs/typescript-consolidated-deno.yaml | 2 + .../typescript-consolidated-inversify.yaml | 2 + .../typescript-consolidated-jquery.yaml | 2 + ...t-consolidated-node-object-parameters.yaml | 2 + bin/configs/typescript-consolidated-node.yaml | 2 + .../languages/TypeScriptClientCodegen.java | 632 ++++++++++++++++++ .../resources/typescript/api_doc.mustache | 84 +++ .../builds/default/.openapi-generator/FILES | 3 + .../typescript/builds/default/PetApi.md | 505 ++++++++++++++ .../typescript/builds/default/StoreApi.md | 233 +++++++ .../typescript/builds/default/UserApi.md | 489 ++++++++++++++ .../builds/deno/.openapi-generator/FILES | 3 + .../petstore/typescript/builds/deno/PetApi.md | 505 ++++++++++++++ .../typescript/builds/deno/StoreApi.md | 233 +++++++ .../typescript/builds/deno/UserApi.md | 489 ++++++++++++++ .../builds/inversify/.openapi-generator/FILES | 3 + .../typescript/builds/inversify/PetApi.md | 505 ++++++++++++++ .../typescript/builds/inversify/StoreApi.md | 233 +++++++ .../typescript/builds/inversify/UserApi.md | 489 ++++++++++++++ .../builds/jquery/.openapi-generator/FILES | 3 + .../typescript/builds/jquery/PetApi.md | 505 ++++++++++++++ .../typescript/builds/jquery/StoreApi.md | 233 +++++++ .../typescript/builds/jquery/UserApi.md | 489 ++++++++++++++ .../object_params/.openapi-generator/FILES | 3 + .../typescript/builds/object_params/PetApi.md | 505 ++++++++++++++ .../builds/object_params/StoreApi.md | 233 +++++++ .../builds/object_params/UserApi.md | 489 ++++++++++++++ 27 files changed, 6876 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/typescript/api_doc.mustache create mode 100644 samples/openapi3/client/petstore/typescript/builds/default/PetApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/default/UserApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/deno/UserApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/inversify/UserApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/jquery/UserApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md create mode 100644 samples/openapi3/client/petstore/typescript/builds/object_params/UserApi.md diff --git a/bin/configs/typescript-consolidated-deno.yaml b/bin/configs/typescript-consolidated-deno.yaml index c3a50488412..b3317884609 100644 --- a/bin/configs/typescript-consolidated-deno.yaml +++ b/bin/configs/typescript-consolidated-deno.yaml @@ -5,3 +5,5 @@ templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: deno npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-inversify.yaml b/bin/configs/typescript-consolidated-inversify.yaml index d0cb671916e..5d230cb88ea 100644 --- a/bin/configs/typescript-consolidated-inversify.yaml +++ b/bin/configs/typescript-consolidated-inversify.yaml @@ -6,3 +6,5 @@ additionalProperties: platform: node npmName: ts-petstore-client useInversify: true + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-jquery.yaml b/bin/configs/typescript-consolidated-jquery.yaml index 66aeeea4d1b..7e9669984c2 100644 --- a/bin/configs/typescript-consolidated-jquery.yaml +++ b/bin/configs/typescript-consolidated-jquery.yaml @@ -5,3 +5,5 @@ templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: framework: jquery npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-node-object-parameters.yaml b/bin/configs/typescript-consolidated-node-object-parameters.yaml index 2558d478d8d..5e4e13a7ec7 100644 --- a/bin/configs/typescript-consolidated-node-object-parameters.yaml +++ b/bin/configs/typescript-consolidated-node-object-parameters.yaml @@ -6,3 +6,5 @@ additionalProperties: platform: node npmName: ts-petstore-client useObjectParameters: true + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-node.yaml b/bin/configs/typescript-consolidated-node.yaml index dae434ea2aa..9fb5f9a0553 100644 --- a/bin/configs/typescript-consolidated-node.yaml +++ b/bin/configs/typescript-consolidated-node.yaml @@ -5,3 +5,5 @@ templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 926a4eb41bb..38c009f47b3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -17,6 +17,13 @@ package org.openapitools.codegen.languages; +import com.google.common.collect.Sets; + +import io.swagger.v3.core.util.Json; +import io.swagger.v3.oas.models.media.*; +import io.swagger.v3.oas.models.media.MediaType; +import io.swagger.v3.oas.models.parameters.RequestBody; +import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; @@ -24,13 +31,22 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; +import org.openapitools.codegen.CodegenDiscriminator.MappedModel; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.github.curiousoddman.rgxgen.RgxGen; +import com.github.curiousoddman.rgxgen.config.RgxGenOption; +import com.github.curiousoddman.rgxgen.config.RgxGenProperties; import java.io.File; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.regex.Pattern; +import java.util.regex.Matcher; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -38,6 +54,8 @@ import java.util.stream.Collectors; import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.underscore; +import static org.openapitools.codegen.utils.OnceLogger.once; + public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(TypeScriptClientCodegen.class); @@ -80,6 +98,9 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo protected String modelPropertyNaming = "camelCase"; protected HashSet languageGenericTypes; + private DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE; + private DateTimeFormatter iso8601DateTime = DateTimeFormatter.ISO_DATE_TIME; + public TypeScriptClientCodegen() { super(); @@ -219,6 +240,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo supportingFiles.add(new SupportingFile("api" + File.separator + "middleware.mustache", "", "middleware.ts")); supportingFiles.add(new SupportingFile("api" + File.separator + "baseapi.mustache", "apis", "baseapi.ts")); apiTemplateFiles.put("api" + File.separator + "api.mustache", ".ts"); + apiDocTemplateFiles.put("api_doc.mustache", ".md"); } public String getNpmName() { @@ -880,6 +902,616 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo addImport(codegenModel, codegenModel.additionalPropertiesType); } + public String typescriptDate(Object dateValue) { + String strValue = null; + if (dateValue instanceof OffsetDateTime) { + OffsetDateTime date = null; + try { + date = (OffsetDateTime) dateValue; + } catch (ClassCastException e) { + LOGGER.warn("Invalid `date` format for value {}", dateValue); + date = ((Date) dateValue).toInstant().atOffset(ZoneOffset.UTC); + } + strValue = date.format(iso8601Date); + } else { + strValue = dateValue.toString(); + } + return "new Date('" + strValue + "').toISOString().split('T')[0];"; + } + + public String typescriptDateTime(Object dateTimeValue) { + String strValue = null; + if (dateTimeValue instanceof OffsetDateTime) { + OffsetDateTime dateTime = null; + try { + dateTime = (OffsetDateTime) dateTimeValue; + } catch (ClassCastException e) { + LOGGER.warn("Invalid `date-time` format for value {}", dateTimeValue); + dateTime = ((Date) dateTimeValue).toInstant().atOffset(ZoneOffset.UTC); + } + strValue = dateTime.format(iso8601DateTime); + } else { + strValue = dateTimeValue.toString(); + } + return "new Date('" + strValue + "')"; + } + + public String getModelName(Schema sc) { + if (sc.get$ref() != null) { + Schema unaliasedSchema = unaliasSchema(sc, importMapping); + if (unaliasedSchema.get$ref() != null) { + return toModelName(ModelUtils.getSimpleRef(sc.get$ref())); + } + } + return null; + } + + /** + * Gets an example if it exists + * + * @param sc input schema + * @return the example value + */ + protected Object getObjectExample(Schema sc) { + Schema schema = sc; + String ref = sc.get$ref(); + if (ref != null) { + schema = ModelUtils.getSchema(this.openAPI, ModelUtils.getSimpleRef(ref)); + } + // TODO handle examples in object models in the future + Boolean objectModel = (ModelUtils.isObjectSchema(schema) || ModelUtils.isMapSchema(schema) || ModelUtils.isComposedSchema(schema)); + if (objectModel) { + return null; + } + if (schema.getExample() != null) { + return schema.getExample(); + } + if (schema.getDefault() != null) { + return schema.getDefault(); + } else if (schema.getEnum() != null && !schema.getEnum().isEmpty()) { + return schema.getEnum().get(0); + } + return null; + } + + /*** + * Ensures that the string has a leading and trailing quote + * + * @param in input string + * @return quoted string + */ + private String ensureQuotes(String in) { + Pattern pattern = Pattern.compile("\r\n|\r|\n"); + Matcher matcher = pattern.matcher(in); + if (matcher.find()) { + // if a string has a new line in it add backticks to make it a typescript multiline string + return "`" + in + "`"; + } + String strPattern = "^['\"].*?['\"]$"; + if (in.matches(strPattern)) { + return in; + } + return "\"" + in + "\""; + } + + @Override + public String toExampleValue(Schema schema) { + Object objExample = getObjectExample(schema); + return toExampleValue(schema, objExample); + } + + public String toExampleValue(Schema schema, Object objExample) { + String modelName = getModelName(schema); + return toExampleValueRecursive(modelName, schema, objExample, 1, "", 0, Sets.newHashSet()); + } + + private Boolean simpleStringSchema(Schema schema) { + Schema sc = schema; + String ref = schema.get$ref(); + if (ref != null) { + sc = ModelUtils.getSchema(this.openAPI, ModelUtils.getSimpleRef(ref)); + } + return ModelUtils.isStringSchema(sc) && !ModelUtils.isDateSchema(sc) && !ModelUtils.isDateTimeSchema(sc) && !"Number".equalsIgnoreCase(sc.getFormat()) && !ModelUtils.isByteArraySchema(sc) && !ModelUtils.isBinarySchema(sc) && schema.getPattern() == null; + } + + private MappedModel getDiscriminatorMappedModel(CodegenDiscriminator disc) { + for (MappedModel mm : disc.getMappedModels()) { + String modelName = mm.getModelName(); + Schema modelSchema = getModelNameToSchemaCache().get(modelName); + if (ModelUtils.isObjectSchema(modelSchema)) { + return mm; + } + } + return null; + } + + /*** + * Recursively generates string examples for schemas + * + * @param modelName the string name of the refed model that will be generated for the schema or null + * @param schema the schema that we need an example for + * @param objExample the example that applies to this schema, for now only string example are used + * @param indentationLevel integer indentation level that we are currently at + * we assume the indentaion amount is 2 spaces times this integer + * @param prefix the string prefix that we will use when assigning an example for this line + * this is used when setting key: value, pairs "key: " is the prefix + * and this is used when setting properties like some_property='some_property_example' + * @param exampleLine this is the current line that we are generatign an example for, starts at 0 + * we don't indentin the 0th line because using the example value looks like: + * prop = ModelName( line 0 + * some_property='some_property_example' line 1 + * ) line 2 + * and our example value is: + * ModelName( line 0 + * some_property='some_property_example' line 1 + * ) line 2 + * @param seenSchemas This set contains all the schemas passed into the recursive function. It is used to check + * if a schema was already passed into the function and breaks the infinite recursive loop. The + * only schemas that are not added are ones that contain $ref != null + * @return the string example + */ + private String toExampleValueRecursive(String modelName, Schema schema, Object objExample, int indentationLevel, String prefix, Integer exampleLine, Set seenSchemas) { + final String indentionConst = " "; + String currentIndentation = ""; + String closingIndentation = ""; + for (int i = 0; i < indentationLevel; i++) currentIndentation += indentionConst; + if (exampleLine.equals(0)) { + closingIndentation = currentIndentation; + currentIndentation = ""; + } else { + closingIndentation = currentIndentation; + } + String openChars = ""; + String closeChars = ""; + String fullPrefix = currentIndentation + prefix + openChars; + + String example = null; + if (objExample != null) { + example = objExample.toString(); + } + // checks if the current schema has already been passed in. If so, breaks the current recursive pass + if (seenSchemas.contains(schema)) { + if (modelName != null) { + return fullPrefix + closeChars; + } else { + // this is a recursive schema + // need to add a reasonable example to avoid + // infinite recursion + if (ModelUtils.isNullable(schema)) { + // if the schema is nullable, then 'null' is a valid value + return fullPrefix + "null" + closeChars; + } else if (ModelUtils.isArraySchema(schema)) { + // the schema is an array, add an empty array + return fullPrefix + "[]" + closeChars; + } else { + // the schema is an object, make an empty object + return fullPrefix + "{}" + closeChars; + } + } + } + + if (null != schema.get$ref()) { + Map allDefinitions = ModelUtils.getSchemas(this.openAPI); + String ref = ModelUtils.getSimpleRef(schema.get$ref()); + Schema refSchema = allDefinitions.get(ref); + if (null == refSchema) { + LOGGER.warn("Unable to find referenced schema " + schema.get$ref() + "\n"); + return fullPrefix + "null" + closeChars; + } + String refModelName = getModelName(schema); + return toExampleValueRecursive(refModelName, refSchema, objExample, indentationLevel, prefix, exampleLine, seenSchemas); + } else if (ModelUtils.isNullType(schema) || isAnyTypeSchema(schema)) { + // The 'null' type is allowed in OAS 3.1 and above. It is not supported by OAS 3.0.x, + // though this tooling supports it. + return fullPrefix + "null" + closeChars; + } else if (ModelUtils.isBooleanSchema(schema)) { + if (objExample == null) { + example = "true"; + } else { + if ("false".equalsIgnoreCase(objExample.toString())) { + example = "false"; + } else { + example = "true"; + } + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isDateSchema(schema)) { + if (objExample == null) { + example = typescriptDate("1970-01-01"); + } else { + example = typescriptDate(objExample); + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isDateTimeSchema(schema)) { + if (objExample == null) { + example = typescriptDateTime("1970-01-01T00:00:00.00Z"); + } else { + example = typescriptDateTime(objExample); + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isBinarySchema(schema)) { + if (objExample == null) { + example = "/path/to/file"; + } + example = "{ data: Buffer.from(fs.readFileSync('" + example + "', 'utf-8')), name: '" + example + "' }"; + return fullPrefix + example + closeChars; + } else if (ModelUtils.isByteArraySchema(schema)) { + if (objExample == null) { + example = "'YQ=='"; + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isStringSchema(schema)) { + if (objExample == null) { + // a BigDecimal: + if ("Number".equalsIgnoreCase(schema.getFormat())) { + example = "2"; + return fullPrefix + example + closeChars; + } else if (StringUtils.isNotBlank(schema.getPattern())) { + String pattern = schema.getPattern(); + /* + RxGen does not support our ECMA dialect https://github.com/curious-odd-man/RgxGen/issues/56 + So strip off the leading / and trailing / and turn on ignore case if we have it + */ + Pattern valueExtractor = Pattern.compile("^/?(.+?)/?(.?)$"); + Matcher m = valueExtractor.matcher(pattern); + RgxGen rgxGen = null; + if (m.find()) { + int groupCount = m.groupCount(); + if (groupCount == 1) { + // only pattern found + String isolatedPattern = m.group(1); + rgxGen = new RgxGen(isolatedPattern); + } else if (groupCount == 2) { + // patterns and flag found + String isolatedPattern = m.group(1); + String flags = m.group(2); + if (flags.contains("i")) { + rgxGen = new RgxGen(isolatedPattern); + RgxGenProperties properties = new RgxGenProperties(); + RgxGenOption.CASE_INSENSITIVE.setInProperties(properties, true); + rgxGen.setProperties(properties); + } else { + rgxGen = new RgxGen(isolatedPattern); + } + } + } else { + rgxGen = new RgxGen(pattern); + } + + // this seed makes it so if we have [a-z] we pick a + Random random = new Random(18); + example = rgxGen.generate(random); + } else if (schema.getMinLength() != null) { + example = ""; + int len = schema.getMinLength().intValue(); + for (int i = 0; i < len; i++) example += "a"; + } else if (ModelUtils.isUUIDSchema(schema)) { + example = "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; + } else { + example = "string_example"; + } + } + return fullPrefix + ensureQuotes(example) + closeChars; + } else if (ModelUtils.isIntegerSchema(schema)) { + if (objExample == null) { + if (schema.getMinimum() != null) { + example = schema.getMinimum().toString(); + } else { + example = "1"; + } + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isNumberSchema(schema)) { + if (objExample == null) { + if (schema.getMinimum() != null) { + example = schema.getMinimum().toString(); + } else { + example = "3.14"; + } + } + return fullPrefix + example + closeChars; + } else if (ModelUtils.isArraySchema(schema)) { + ArraySchema arrayschema = (ArraySchema) schema; + Schema itemSchema = arrayschema.getItems(); + String itemModelName = getModelName(itemSchema); + if (objExample instanceof Iterable && itemModelName == null) { + // If the example is already a list, return it directly instead of wrongly wrap it in another list + return fullPrefix + objExample.toString() + closeChars; + } + Set newSeenSchemas = new HashSet<>(seenSchemas); + newSeenSchemas.add(schema); + example = fullPrefix + "[" + "\n" + toExampleValueRecursive(itemModelName, itemSchema, objExample, indentationLevel + 1, "", exampleLine + 1, newSeenSchemas) + ",\n" + closingIndentation + "]" + closeChars; + return example; + } else if (ModelUtils.isMapSchema(schema)) { + if (modelName == null) { + fullPrefix += "{"; + closeChars = "}"; + } + Object addPropsObj = schema.getAdditionalProperties(); + // TODO handle true case for additionalProperties + if (addPropsObj instanceof Schema) { + Schema addPropsSchema = (Schema) addPropsObj; + String key = "key"; + Object addPropsExample = getObjectExample(addPropsSchema); + if (addPropsSchema.getEnum() != null && !addPropsSchema.getEnum().isEmpty()) { + key = addPropsSchema.getEnum().get(0).toString(); + } + addPropsExample = exampleFromStringOrArraySchema(addPropsSchema, addPropsExample, key); + String addPropPrefix = key + ": "; + if (modelName == null) { + addPropPrefix = ensureQuotes(key) + ": "; + } + String addPropsModelName = "\"" + getModelName(addPropsSchema) + "\""; + Set newSeenSchemas = new HashSet<>(seenSchemas); + newSeenSchemas.add(schema); + example = fullPrefix + "\n" + toExampleValueRecursive(addPropsModelName, addPropsSchema, addPropsExample, indentationLevel + 1, addPropPrefix, exampleLine + 1, newSeenSchemas) + ",\n" + closingIndentation + closeChars; + } else { + example = fullPrefix + closeChars; + } + return example; + } else if (ModelUtils.isComposedSchema(schema)) { + ComposedSchema cm = (ComposedSchema) schema; + List ls = cm.getOneOf(); + if (ls != null && !ls.isEmpty()) { + return fullPrefix + toExampleValue(ls.get(0)) + closeChars; + } + return fullPrefix + closeChars; + } else if (ModelUtils.isObjectSchema(schema)) { + fullPrefix += "{"; + closeChars = "}"; + CodegenDiscriminator disc = createDiscriminator(modelName, schema, openAPI); + if (disc != null) { + MappedModel mm = getDiscriminatorMappedModel(disc); + if (mm != null) { + String discPropNameValue = mm.getMappingName(); + String chosenModelName = mm.getModelName(); + // TODO handle this case in the future, this is when the discriminated + // schema allOf includes this schema, like Cat allOf includes Pet + // so this is the composed schema use case + } else { + return fullPrefix + closeChars; + } + } + + Set newSeenSchemas = new HashSet<>(seenSchemas); + newSeenSchemas.add(schema); + String exampleForObjectModel = exampleForObjectModel(schema, fullPrefix, closeChars, null, indentationLevel, exampleLine, closingIndentation, newSeenSchemas); + return exampleForObjectModel; + } else { + LOGGER.warn("Type " + schema.getType() + " not handled properly in toExampleValue"); + } + + return example; + } + + private String exampleForObjectModel(Schema schema, String fullPrefix, String closeChars, CodegenProperty discProp, int indentationLevel, int exampleLine, String closingIndentation, Set seenSchemas) { + Map requiredAndOptionalProps = schema.getProperties(); + if (requiredAndOptionalProps == null || requiredAndOptionalProps.isEmpty()) { + return fullPrefix + closeChars; + } + + String example = fullPrefix + "\n"; + for (Map.Entry entry : requiredAndOptionalProps.entrySet()) { + String propName = entry.getKey(); + Schema propSchema = entry.getValue(); + boolean readOnly = false; + if (propSchema.getReadOnly() != null) { + readOnly = propSchema.getReadOnly(); + } + if (readOnly) { + continue; + } + String ref = propSchema.get$ref(); + if (ref != null) { + Schema refSchema = ModelUtils.getSchema(this.openAPI, ModelUtils.getSimpleRef(ref)); + if (refSchema.getReadOnly() != null) { + readOnly = refSchema.getReadOnly(); + } + if (readOnly) { + continue; + } + } + propName = toVarName(propName); + String propModelName = null; + Object propExample = null; + if (discProp != null && propName.equals(discProp.name)) { + propModelName = null; + propExample = discProp.example; + } else { + propModelName = getModelName(propSchema); + propExample = exampleFromStringOrArraySchema(propSchema, null, propName); + } + example += toExampleValueRecursive(propModelName, propSchema, propExample, indentationLevel + 1, propName + ": ", exampleLine + 1, seenSchemas) + ",\n"; + } + // TODO handle additionalProperties also + example += closingIndentation + closeChars; + return example; + } + + private Object exampleFromStringOrArraySchema(Schema sc, Object currentExample, String propName) { + if (currentExample != null) { + return currentExample; + } + Schema schema = sc; + String ref = sc.get$ref(); + if (ref != null) { + schema = ModelUtils.getSchema(this.openAPI, ModelUtils.getSimpleRef(ref)); + } + Object example = getObjectExample(schema); + if (example != null) { + return example; + } else if (simpleStringSchema(schema)) { + return propName + "_example"; + } else if (ModelUtils.isArraySchema(schema)) { + ArraySchema arraySchema = (ArraySchema) schema; + Schema itemSchema = arraySchema.getItems(); + example = getObjectExample(itemSchema); + if (example != null) { + return example; + } else if (simpleStringSchema(itemSchema)) { + return propName + "_example"; + } + } + return null; + } + + protected String setPropertyExampleValue(CodegenProperty p) { + String example; + + if (p == null) { + return "null"; + } + + if (p.defaultValue == null) { + example = p.example; + } else { + example = p.defaultValue; + } + + String type = p.baseType; + if (type == null) { + type = p.dataType; + } + + if (Boolean.TRUE.equals(p.isInteger)) { + if (example == null) { + example = "56"; + } + } else if (Boolean.TRUE.equals(p.isLong)) { + if (example == null) { + example = "789"; + } + } else if (Boolean.TRUE.equals(p.isDouble) + || Boolean.TRUE.equals(p.isFloat) + || Boolean.TRUE.equals(p.isNumber)) { + if (example == null) { + example = "3.4"; + } + } else if (Boolean.TRUE.equals(p.isBoolean)) { + if (example == null) { + example = "true"; + } + } else if (Boolean.TRUE.equals(p.isFile) || Boolean.TRUE.equals(p.isBinary)) { + if (example == null) { + example = "/path/to/file"; + } + example = "\"" + escapeText(example) + "\""; + } else if (Boolean.TRUE.equals(p.isDate)) { + if (example == null) { + example = "2013-10-20"; + } + example = "new Date(\"" + escapeText(example) + "\")"; + } else if (Boolean.TRUE.equals(p.isDateTime)) { + if (example == null) { + example = "2013-10-20T19:20:30+01:00"; + } + example = "new Date(\"" + escapeText(example) + "\")"; + } else if (Boolean.TRUE.equals(p.isString)) { + if (example == null) { + example = p.name + "_example"; + } + example = "\"" + escapeText(example) + "\""; + } else if (!languageSpecificPrimitives.contains(type)) { + // type is a model class, e.g. User + example = "new " + "{{moduleName}}" + "." + type + "()"; + } + + return example; + } + + + /*** + * + * Set the codegenParameter example value + * We have a custom version of this function so we can invoke toExampleValue + * + * @param codegenParameter the item we are setting the example on + * @param parameter the base parameter that came from the spec + */ + @Override + public void setParameterExampleValue(CodegenParameter codegenParameter, Parameter parameter) { + Schema schema = parameter.getSchema(); + if (schema == null) { + LOGGER.warn("CodegenParameter.example defaulting to null because parameter lacks a schema"); + return; + } + + Object example = null; + if (codegenParameter.vendorExtensions != null && codegenParameter.vendorExtensions.containsKey("x-example")) { + example = codegenParameter.vendorExtensions.get("x-example"); + } else if (parameter.getExample() != null) { + example = parameter.getExample(); + } else if (parameter.getExamples() != null && !parameter.getExamples().isEmpty() && parameter.getExamples().values().iterator().next().getValue() != null) { + example = parameter.getExamples().values().iterator().next().getValue(); + } else { + example = getObjectExample(schema); + } + example = exampleFromStringOrArraySchema(schema, example, parameter.getName()); + String finalExample = toExampleValue(schema, example); + codegenParameter.example = finalExample; + } + + /** + * Return the example value of the parameter. + * + * @param codegenParameter Codegen parameter + * @param requestBody Request body + */ + @Override + public void setParameterExampleValue(CodegenParameter codegenParameter, RequestBody requestBody) { + if (codegenParameter.vendorExtensions != null && codegenParameter.vendorExtensions.containsKey("x-example")) { + codegenParameter.example = Json.pretty(codegenParameter.vendorExtensions.get("x-example")); + } + + Content content = requestBody.getContent(); + + if (content.size() > 1) { + // @see ModelUtils.getSchemaFromContent() + once(LOGGER).warn("Multiple MediaTypes found, using only the first one"); + } + + MediaType mediaType = content.values().iterator().next(); + Schema schema = mediaType.getSchema(); + if (schema == null) { + LOGGER.warn("CodegenParameter.example defaulting to null because requestBody content lacks a schema"); + return; + } + + Object example = null; + if (mediaType.getExample() != null) { + example = mediaType.getExample(); + } else if (mediaType.getExamples() != null && !mediaType.getExamples().isEmpty() && mediaType.getExamples().values().iterator().next().getValue() != null) { + example = mediaType.getExamples().values().iterator().next().getValue(); + } else { + example = getObjectExample(schema); + } + example = exampleFromStringOrArraySchema(schema, example, codegenParameter.paramName); + codegenParameter.example = toExampleValue(schema, example); + } + + /** + * Create a CodegenParameter for a Form Property + * We have a custom version of this method so we can invoke + * setParameterExampleValue(codegenParameter, parameter) + * rather than setParameterExampleValue(codegenParameter) + * This ensures that all of our samples are generated in + * toExampleValueRecursive + * + * @param name the property name + * @param propertySchema the property schema + * @param imports our import set + * @return the resultant CodegenParameter + */ + @Override + public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set imports) { + CodegenParameter cp = super.fromFormProperty(name, propertySchema, imports); + Parameter p = new Parameter(); + p.setSchema(propertySchema); + p.setName(cp.paramName); + setParameterExampleValue(cp, p); + return cp; + } + @Override public String toAnyOfName(List names, ComposedSchema composedSchema) { List types = getTypesFromSchemas(composedSchema.getAnyOf()); diff --git a/modules/openapi-generator/src/main/resources/typescript/api_doc.mustache b/modules/openapi-generator/src/main/resources/typescript/api_doc.mustache new file mode 100644 index 00000000000..e58bf337875 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/typescript/api_doc.mustache @@ -0,0 +1,84 @@ +# {{moduleName}}.{{classname}}{{#description}} + +{{description}}{{/description}} + +All URIs are relative to *{{basePath}}* + +Method | HTTP request | Description +------------- | ------------- | ------------- +{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}} +{{/operation}}{{/operations}} + +{{#operations}} +{{#operation}} +# **{{{operationId}}}** +> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#requiredParams}}{{^defaultValue}}{{paramName}}{{^-last}}, {{/-last}}{{/defaultValue}}{{/requiredParams}}) + +{{#notes}} +{{{notes}}} +{{/notes}} + +### Example + + +```typescript +import { {{{moduleName}}} } from '{{{projectName}}}'; +import * as fs from 'fs'; + +const configuration = {{{moduleName}}}.createConfiguration(); +const apiInstance = new {{{moduleName}}}.{{classname}}(configuration); + +{{#hasParams}} +let body:{{{moduleName}}}.{{classname}}{{operationIdCamelCase}}Request = { +{{#allParams}} + // {{{dataType}}}{{#description}} | {{{description}}}{{/description}}{{^required}} (optional){{/required}} + {{paramName}}: {{{example}}}, +{{/allParams}} +}; +{{/hasParams}} +{{^hasParams}} +let body:any = {}; +{{/hasParams}} + +apiInstance.{{{operationId}}}(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +{{^hasParams}}This endpoint does not need any parameter.{{/hasParams}}{{#allParams}}{{#-last}} +Name | Type | Description | Notes +------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}} +{{#allParams}}{{^defaultValue}} **{{paramName}}** | {{^isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}| {{description}} | +{{/defaultValue}}{{/allParams}}{{#allParams}}{{#defaultValue}} **{{paramName}}** | {{^isPrimitiveType}}{{^isEnum}}**{{dataType}}**{{/isEnum}}{{/isPrimitiveType}}{{#isPrimitiveType}}[**{{dataType}}**]{{/isPrimitiveType}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}{{#-first}}**Array<{{/-first}}{{value}}{{^-last}} | {{/-last}}{{#-last}}>**{{/-last}}{{/enumVars}}{{/allowableValues}}{{/isEnum}} | {{description}} |{{^required}} (optional){{/required}} defaults to {{{.}}} +{{/defaultValue}}{{/allParams}} + +### Return type + +{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}} + +### Authorization + +{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}} + +### HTTP request headers + + - **Content-Type**: {{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{^consumes}}Not defined{{/consumes}} + - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/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}} +{{/operations}} + diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES index 29f9ff544d9..4137d52d1cd 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES @@ -1,5 +1,8 @@ .gitignore +PetApi.md README.md +StoreApi.md +UserApi.md apis/PetApi.ts apis/StoreApi.ts apis/UserApi.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md new file mode 100644 index 00000000000..2fe727d84fa --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md @@ -0,0 +1,505 @@ +# petstore.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image + + +# **addPet** +> Pet addPet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiAddPetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.addPet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **deletePet** +> deletePet() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiDeletePetRequest = { + // number | Pet id to delete + petId: 1, + // string (optional) + apiKey: "api_key_example", +}; + +apiInstance.deletePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | Pet id to delete | defaults to undefined + **apiKey** | [**string**] | | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByStatus** +> Array findPetsByStatus() + +Multiple status values can be provided with comma separated strings + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByStatusRequest = { + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + status: [ + "available", + ], +}; + +apiInstance.findPetsByStatus(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | **Array<'available' | 'pending' | 'sold'>** | Status values that need to be considered for filter | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByTags** +> Array findPetsByTags() + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByTagsRequest = { + // Array | Tags to filter by + tags: [ + "tags_example", + ], +}; + +apiInstance.findPetsByTags(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | **Array<string>** | Tags to filter by | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **getPetById** +> Pet getPetById() + +Returns a single pet + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiGetPetByIdRequest = { + // number | ID of pet to return + petId: 1, +}; + +apiInstance.getPetById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to return | defaults to undefined + + +### Return type + +**Pet** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updatePet** +> Pet updatePet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.updatePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **updatePetWithForm** +> updatePetWithForm() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetWithFormRequest = { + // number | ID of pet that needs to be updated + petId: 1, + // string | Updated name of the pet (optional) + name: "name_example", + // string | Updated status of the pet (optional) + status: "status_example", +}; + +apiInstance.updatePetWithForm(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet that needs to be updated | defaults to undefined + **name** | [**string**] | Updated name of the pet | (optional) defaults to undefined + **status** | [**string**] | Updated status of the pet | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **uploadFile** +> ApiResponse uploadFile() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUploadFileRequest = { + // number | ID of pet to update + petId: 1, + // string | Additional data to pass to server (optional) + additionalMetadata: "additionalMetadata_example", + // HttpFile | file to upload (optional) + file: { data: Buffer.from(fs.readFileSync('/path/to/file', 'utf-8')), name: '/path/to/file' }, +}; + +apiInstance.uploadFile(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to update | defaults to undefined + **additionalMetadata** | [**string**] | Additional data to pass to server | (optional) defaults to undefined + **file** | [**HttpFile**] | file to upload | (optional) defaults to undefined + + +### Return type + +**ApiResponse** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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/typescript/builds/default/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md new file mode 100644 index 00000000000..b2a63f78219 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md @@ -0,0 +1,233 @@ +# petstore.StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +# **deleteOrder** +> deleteOrder() + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiDeleteOrderRequest = { + // string | ID of the order that needs to be deleted + orderId: "orderId_example", +}; + +apiInstance.deleteOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**string**] | ID of the order that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **getInventory** +> { [key: string]: number; } getInventory() + +Returns a map of status codes to quantities + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:any = {}; + +apiInstance.getInventory(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +**{ [key: string]: number; }** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getOrderById** +> Order getOrderById() + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiGetOrderByIdRequest = { + // number | ID of pet that needs to be fetched + orderId: 1, +}; + +apiInstance.getOrderById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**number**] | ID of pet that needs to be fetched | defaults to undefined + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **placeOrder** +> Order placeOrder(order) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiPlaceOrderRequest = { + // Order | order placed for purchasing the pet + order: { + id: 1, + petId: 1, + quantity: 1, + shipDate: new Date('1970-01-01T00:00:00.00Z'), + status: "placed", + complete: false, + }, +}; + +apiInstance.placeOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | **Order**| order placed for purchasing the pet | + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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/typescript/builds/default/UserApi.md b/samples/openapi3/client/petstore/typescript/builds/default/UserApi.md new file mode 100644 index 00000000000..e5ac670bd7c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/default/UserApi.md @@ -0,0 +1,489 @@ +# petstore.UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +# **createUser** +> createUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUserRequest = { + // User | Created user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.createUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Created user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithArrayInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithArrayInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithListInput** +> createUsersWithListInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithListInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithListInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **deleteUser** +> deleteUser() + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiDeleteUserRequest = { + // string | The name that needs to be deleted + username: "username_example", +}; + +apiInstance.deleteUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getUserByName** +> User getUserByName() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiGetUserByNameRequest = { + // string | The name that needs to be fetched. Use user1 for testing. + username: "username_example", +}; + +apiInstance.getUserByName(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be fetched. Use user1 for testing. | defaults to undefined + + +### Return type + +**User** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **loginUser** +> string loginUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiLoginUserRequest = { + // string | The user name for login + username: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + // string | The password for login in clear text + password: "password_example", +}; + +apiInstance.loginUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The user name for login | defaults to undefined + **password** | [**string**] | The password for login in clear text | defaults to undefined + + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Set-Cookie - Cookie authentication key for use with the `api_key` apiKey authentication.
                        * X-Rate-Limit - calls per hour allowed by the user
                        * X-Expires-After - date in UTC when toekn 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) + +# **logoutUser** +> logoutUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:any = {}; + +apiInstance.logoutUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updateUser** +> updateUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiUpdateUserRequest = { + // string | name that need to be deleted + username: "username_example", + // User | Updated user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.updateUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Updated user object | + **username** | [**string**] | name that need to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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/typescript/builds/deno/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES index 3b444ce2b10..156ef7ba37f 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES @@ -1,4 +1,7 @@ .gitignore +PetApi.md +StoreApi.md +UserApi.md apis/PetApi.ts apis/StoreApi.ts apis/UserApi.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md new file mode 100644 index 00000000000..2fe727d84fa --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md @@ -0,0 +1,505 @@ +# petstore.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image + + +# **addPet** +> Pet addPet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiAddPetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.addPet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **deletePet** +> deletePet() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiDeletePetRequest = { + // number | Pet id to delete + petId: 1, + // string (optional) + apiKey: "api_key_example", +}; + +apiInstance.deletePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | Pet id to delete | defaults to undefined + **apiKey** | [**string**] | | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByStatus** +> Array findPetsByStatus() + +Multiple status values can be provided with comma separated strings + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByStatusRequest = { + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + status: [ + "available", + ], +}; + +apiInstance.findPetsByStatus(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | **Array<'available' | 'pending' | 'sold'>** | Status values that need to be considered for filter | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByTags** +> Array findPetsByTags() + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByTagsRequest = { + // Array | Tags to filter by + tags: [ + "tags_example", + ], +}; + +apiInstance.findPetsByTags(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | **Array<string>** | Tags to filter by | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **getPetById** +> Pet getPetById() + +Returns a single pet + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiGetPetByIdRequest = { + // number | ID of pet to return + petId: 1, +}; + +apiInstance.getPetById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to return | defaults to undefined + + +### Return type + +**Pet** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updatePet** +> Pet updatePet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.updatePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **updatePetWithForm** +> updatePetWithForm() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetWithFormRequest = { + // number | ID of pet that needs to be updated + petId: 1, + // string | Updated name of the pet (optional) + name: "name_example", + // string | Updated status of the pet (optional) + status: "status_example", +}; + +apiInstance.updatePetWithForm(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet that needs to be updated | defaults to undefined + **name** | [**string**] | Updated name of the pet | (optional) defaults to undefined + **status** | [**string**] | Updated status of the pet | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **uploadFile** +> ApiResponse uploadFile() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUploadFileRequest = { + // number | ID of pet to update + petId: 1, + // string | Additional data to pass to server (optional) + additionalMetadata: "additionalMetadata_example", + // HttpFile | file to upload (optional) + file: { data: Buffer.from(fs.readFileSync('/path/to/file', 'utf-8')), name: '/path/to/file' }, +}; + +apiInstance.uploadFile(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to update | defaults to undefined + **additionalMetadata** | [**string**] | Additional data to pass to server | (optional) defaults to undefined + **file** | [**HttpFile**] | file to upload | (optional) defaults to undefined + + +### Return type + +**ApiResponse** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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/typescript/builds/deno/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md new file mode 100644 index 00000000000..b2a63f78219 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md @@ -0,0 +1,233 @@ +# petstore.StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +# **deleteOrder** +> deleteOrder() + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiDeleteOrderRequest = { + // string | ID of the order that needs to be deleted + orderId: "orderId_example", +}; + +apiInstance.deleteOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**string**] | ID of the order that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **getInventory** +> { [key: string]: number; } getInventory() + +Returns a map of status codes to quantities + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:any = {}; + +apiInstance.getInventory(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +**{ [key: string]: number; }** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getOrderById** +> Order getOrderById() + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiGetOrderByIdRequest = { + // number | ID of pet that needs to be fetched + orderId: 1, +}; + +apiInstance.getOrderById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**number**] | ID of pet that needs to be fetched | defaults to undefined + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **placeOrder** +> Order placeOrder(order) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiPlaceOrderRequest = { + // Order | order placed for purchasing the pet + order: { + id: 1, + petId: 1, + quantity: 1, + shipDate: new Date('1970-01-01T00:00:00.00Z'), + status: "placed", + complete: false, + }, +}; + +apiInstance.placeOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | **Order**| order placed for purchasing the pet | + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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/typescript/builds/deno/UserApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/UserApi.md new file mode 100644 index 00000000000..e5ac670bd7c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/deno/UserApi.md @@ -0,0 +1,489 @@ +# petstore.UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +# **createUser** +> createUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUserRequest = { + // User | Created user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.createUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Created user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithArrayInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithArrayInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithListInput** +> createUsersWithListInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithListInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithListInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **deleteUser** +> deleteUser() + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiDeleteUserRequest = { + // string | The name that needs to be deleted + username: "username_example", +}; + +apiInstance.deleteUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getUserByName** +> User getUserByName() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiGetUserByNameRequest = { + // string | The name that needs to be fetched. Use user1 for testing. + username: "username_example", +}; + +apiInstance.getUserByName(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be fetched. Use user1 for testing. | defaults to undefined + + +### Return type + +**User** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **loginUser** +> string loginUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiLoginUserRequest = { + // string | The user name for login + username: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + // string | The password for login in clear text + password: "password_example", +}; + +apiInstance.loginUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The user name for login | defaults to undefined + **password** | [**string**] | The password for login in clear text | defaults to undefined + + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Set-Cookie - Cookie authentication key for use with the `api_key` apiKey authentication.
                        * X-Rate-Limit - calls per hour allowed by the user
                        * X-Expires-After - date in UTC when toekn 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) + +# **logoutUser** +> logoutUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:any = {}; + +apiInstance.logoutUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updateUser** +> updateUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiUpdateUserRequest = { + // string | name that need to be deleted + username: "username_example", + // User | Updated user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.updateUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Updated user object | + **username** | [**string**] | name that need to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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/typescript/builds/inversify/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES index 4f2382c7e38..2546d613ef9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES @@ -1,5 +1,8 @@ .gitignore +PetApi.md README.md +StoreApi.md +UserApi.md apis/PetApi.service.ts apis/PetApi.ts apis/StoreApi.service.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md new file mode 100644 index 00000000000..2fe727d84fa --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md @@ -0,0 +1,505 @@ +# petstore.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image + + +# **addPet** +> Pet addPet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiAddPetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.addPet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **deletePet** +> deletePet() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiDeletePetRequest = { + // number | Pet id to delete + petId: 1, + // string (optional) + apiKey: "api_key_example", +}; + +apiInstance.deletePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | Pet id to delete | defaults to undefined + **apiKey** | [**string**] | | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByStatus** +> Array findPetsByStatus() + +Multiple status values can be provided with comma separated strings + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByStatusRequest = { + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + status: [ + "available", + ], +}; + +apiInstance.findPetsByStatus(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | **Array<'available' | 'pending' | 'sold'>** | Status values that need to be considered for filter | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByTags** +> Array findPetsByTags() + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByTagsRequest = { + // Array | Tags to filter by + tags: [ + "tags_example", + ], +}; + +apiInstance.findPetsByTags(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | **Array<string>** | Tags to filter by | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **getPetById** +> Pet getPetById() + +Returns a single pet + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiGetPetByIdRequest = { + // number | ID of pet to return + petId: 1, +}; + +apiInstance.getPetById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to return | defaults to undefined + + +### Return type + +**Pet** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updatePet** +> Pet updatePet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.updatePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **updatePetWithForm** +> updatePetWithForm() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetWithFormRequest = { + // number | ID of pet that needs to be updated + petId: 1, + // string | Updated name of the pet (optional) + name: "name_example", + // string | Updated status of the pet (optional) + status: "status_example", +}; + +apiInstance.updatePetWithForm(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet that needs to be updated | defaults to undefined + **name** | [**string**] | Updated name of the pet | (optional) defaults to undefined + **status** | [**string**] | Updated status of the pet | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **uploadFile** +> ApiResponse uploadFile() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUploadFileRequest = { + // number | ID of pet to update + petId: 1, + // string | Additional data to pass to server (optional) + additionalMetadata: "additionalMetadata_example", + // HttpFile | file to upload (optional) + file: { data: Buffer.from(fs.readFileSync('/path/to/file', 'utf-8')), name: '/path/to/file' }, +}; + +apiInstance.uploadFile(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to update | defaults to undefined + **additionalMetadata** | [**string**] | Additional data to pass to server | (optional) defaults to undefined + **file** | [**HttpFile**] | file to upload | (optional) defaults to undefined + + +### Return type + +**ApiResponse** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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/typescript/builds/inversify/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md new file mode 100644 index 00000000000..b2a63f78219 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md @@ -0,0 +1,233 @@ +# petstore.StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +# **deleteOrder** +> deleteOrder() + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiDeleteOrderRequest = { + // string | ID of the order that needs to be deleted + orderId: "orderId_example", +}; + +apiInstance.deleteOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**string**] | ID of the order that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **getInventory** +> { [key: string]: number; } getInventory() + +Returns a map of status codes to quantities + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:any = {}; + +apiInstance.getInventory(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +**{ [key: string]: number; }** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getOrderById** +> Order getOrderById() + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiGetOrderByIdRequest = { + // number | ID of pet that needs to be fetched + orderId: 1, +}; + +apiInstance.getOrderById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**number**] | ID of pet that needs to be fetched | defaults to undefined + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **placeOrder** +> Order placeOrder(order) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiPlaceOrderRequest = { + // Order | order placed for purchasing the pet + order: { + id: 1, + petId: 1, + quantity: 1, + shipDate: new Date('1970-01-01T00:00:00.00Z'), + status: "placed", + complete: false, + }, +}; + +apiInstance.placeOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | **Order**| order placed for purchasing the pet | + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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/typescript/builds/inversify/UserApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/UserApi.md new file mode 100644 index 00000000000..e5ac670bd7c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/UserApi.md @@ -0,0 +1,489 @@ +# petstore.UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +# **createUser** +> createUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUserRequest = { + // User | Created user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.createUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Created user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithArrayInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithArrayInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithListInput** +> createUsersWithListInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithListInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithListInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **deleteUser** +> deleteUser() + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiDeleteUserRequest = { + // string | The name that needs to be deleted + username: "username_example", +}; + +apiInstance.deleteUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getUserByName** +> User getUserByName() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiGetUserByNameRequest = { + // string | The name that needs to be fetched. Use user1 for testing. + username: "username_example", +}; + +apiInstance.getUserByName(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be fetched. Use user1 for testing. | defaults to undefined + + +### Return type + +**User** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **loginUser** +> string loginUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiLoginUserRequest = { + // string | The user name for login + username: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + // string | The password for login in clear text + password: "password_example", +}; + +apiInstance.loginUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The user name for login | defaults to undefined + **password** | [**string**] | The password for login in clear text | defaults to undefined + + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Set-Cookie - Cookie authentication key for use with the `api_key` apiKey authentication.
                        * X-Rate-Limit - calls per hour allowed by the user
                        * X-Expires-After - date in UTC when toekn 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) + +# **logoutUser** +> logoutUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:any = {}; + +apiInstance.logoutUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updateUser** +> updateUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiUpdateUserRequest = { + // string | name that need to be deleted + username: "username_example", + // User | Updated user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.updateUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Updated user object | + **username** | [**string**] | name that need to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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/typescript/builds/jquery/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES index 031c2957055..dfa2fadc5b0 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES @@ -1,5 +1,8 @@ .gitignore +PetApi.md README.md +StoreApi.md +UserApi.md apis/PetApi.ts apis/StoreApi.ts apis/UserApi.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md new file mode 100644 index 00000000000..2fe727d84fa --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md @@ -0,0 +1,505 @@ +# petstore.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image + + +# **addPet** +> Pet addPet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiAddPetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.addPet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **deletePet** +> deletePet() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiDeletePetRequest = { + // number | Pet id to delete + petId: 1, + // string (optional) + apiKey: "api_key_example", +}; + +apiInstance.deletePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | Pet id to delete | defaults to undefined + **apiKey** | [**string**] | | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByStatus** +> Array findPetsByStatus() + +Multiple status values can be provided with comma separated strings + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByStatusRequest = { + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + status: [ + "available", + ], +}; + +apiInstance.findPetsByStatus(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | **Array<'available' | 'pending' | 'sold'>** | Status values that need to be considered for filter | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByTags** +> Array findPetsByTags() + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByTagsRequest = { + // Array | Tags to filter by + tags: [ + "tags_example", + ], +}; + +apiInstance.findPetsByTags(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | **Array<string>** | Tags to filter by | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **getPetById** +> Pet getPetById() + +Returns a single pet + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiGetPetByIdRequest = { + // number | ID of pet to return + petId: 1, +}; + +apiInstance.getPetById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to return | defaults to undefined + + +### Return type + +**Pet** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updatePet** +> Pet updatePet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.updatePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **updatePetWithForm** +> updatePetWithForm() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetWithFormRequest = { + // number | ID of pet that needs to be updated + petId: 1, + // string | Updated name of the pet (optional) + name: "name_example", + // string | Updated status of the pet (optional) + status: "status_example", +}; + +apiInstance.updatePetWithForm(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet that needs to be updated | defaults to undefined + **name** | [**string**] | Updated name of the pet | (optional) defaults to undefined + **status** | [**string**] | Updated status of the pet | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **uploadFile** +> ApiResponse uploadFile() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUploadFileRequest = { + // number | ID of pet to update + petId: 1, + // string | Additional data to pass to server (optional) + additionalMetadata: "additionalMetadata_example", + // HttpFile | file to upload (optional) + file: { data: Buffer.from(fs.readFileSync('/path/to/file', 'utf-8')), name: '/path/to/file' }, +}; + +apiInstance.uploadFile(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to update | defaults to undefined + **additionalMetadata** | [**string**] | Additional data to pass to server | (optional) defaults to undefined + **file** | [**HttpFile**] | file to upload | (optional) defaults to undefined + + +### Return type + +**ApiResponse** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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/typescript/builds/jquery/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md new file mode 100644 index 00000000000..b2a63f78219 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md @@ -0,0 +1,233 @@ +# petstore.StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +# **deleteOrder** +> deleteOrder() + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiDeleteOrderRequest = { + // string | ID of the order that needs to be deleted + orderId: "orderId_example", +}; + +apiInstance.deleteOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**string**] | ID of the order that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **getInventory** +> { [key: string]: number; } getInventory() + +Returns a map of status codes to quantities + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:any = {}; + +apiInstance.getInventory(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +**{ [key: string]: number; }** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getOrderById** +> Order getOrderById() + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiGetOrderByIdRequest = { + // number | ID of pet that needs to be fetched + orderId: 1, +}; + +apiInstance.getOrderById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**number**] | ID of pet that needs to be fetched | defaults to undefined + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **placeOrder** +> Order placeOrder(order) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiPlaceOrderRequest = { + // Order | order placed for purchasing the pet + order: { + id: 1, + petId: 1, + quantity: 1, + shipDate: new Date('1970-01-01T00:00:00.00Z'), + status: "placed", + complete: false, + }, +}; + +apiInstance.placeOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | **Order**| order placed for purchasing the pet | + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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/typescript/builds/jquery/UserApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/UserApi.md new file mode 100644 index 00000000000..e5ac670bd7c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/UserApi.md @@ -0,0 +1,489 @@ +# petstore.UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +# **createUser** +> createUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUserRequest = { + // User | Created user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.createUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Created user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithArrayInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithArrayInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithListInput** +> createUsersWithListInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithListInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithListInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **deleteUser** +> deleteUser() + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiDeleteUserRequest = { + // string | The name that needs to be deleted + username: "username_example", +}; + +apiInstance.deleteUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getUserByName** +> User getUserByName() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiGetUserByNameRequest = { + // string | The name that needs to be fetched. Use user1 for testing. + username: "username_example", +}; + +apiInstance.getUserByName(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be fetched. Use user1 for testing. | defaults to undefined + + +### Return type + +**User** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **loginUser** +> string loginUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiLoginUserRequest = { + // string | The user name for login + username: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + // string | The password for login in clear text + password: "password_example", +}; + +apiInstance.loginUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The user name for login | defaults to undefined + **password** | [**string**] | The password for login in clear text | defaults to undefined + + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Set-Cookie - Cookie authentication key for use with the `api_key` apiKey authentication.
                        * X-Rate-Limit - calls per hour allowed by the user
                        * X-Expires-After - date in UTC when toekn 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) + +# **logoutUser** +> logoutUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:any = {}; + +apiInstance.logoutUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updateUser** +> updateUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiUpdateUserRequest = { + // string | name that need to be deleted + username: "username_example", + // User | Updated user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.updateUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Updated user object | + **username** | [**string**] | name that need to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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/typescript/builds/object_params/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES index 29f9ff544d9..4137d52d1cd 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES @@ -1,5 +1,8 @@ .gitignore +PetApi.md README.md +StoreApi.md +UserApi.md apis/PetApi.ts apis/StoreApi.ts apis/UserApi.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md new file mode 100644 index 00000000000..2fe727d84fa --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md @@ -0,0 +1,505 @@ +# petstore.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image + + +# **addPet** +> Pet addPet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiAddPetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.addPet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **deletePet** +> deletePet() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiDeletePetRequest = { + // number | Pet id to delete + petId: 1, + // string (optional) + apiKey: "api_key_example", +}; + +apiInstance.deletePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | Pet id to delete | defaults to undefined + **apiKey** | [**string**] | | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByStatus** +> Array findPetsByStatus() + +Multiple status values can be provided with comma separated strings + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByStatusRequest = { + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + status: [ + "available", + ], +}; + +apiInstance.findPetsByStatus(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | **Array<'available' | 'pending' | 'sold'>** | Status values that need to be considered for filter | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **findPetsByTags** +> Array findPetsByTags() + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiFindPetsByTagsRequest = { + // Array | Tags to filter by + tags: [ + "tags_example", + ], +}; + +apiInstance.findPetsByTags(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | **Array<string>** | Tags to filter by | defaults to undefined + + +### Return type + +**Array** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **getPetById** +> Pet getPetById() + +Returns a single pet + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiGetPetByIdRequest = { + // number | ID of pet to return + petId: 1, +}; + +apiInstance.getPetById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to return | defaults to undefined + + +### Return type + +**Pet** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updatePet** +> Pet updatePet(pet) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetRequest = { + // Pet | Pet object that needs to be added to the store + pet: { + id: 1, + category: { + id: 1, + name: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + }, + name: "doggie", + photoUrls: [ + "photoUrls_example", + ], + tags: [ + { + id: 1, + name: "name_example", + }, + ], + status: "available", + }, +}; + +apiInstance.updatePet(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | **Pet**| Pet object that needs to be added to the store | + + +### Return type + +**Pet** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### 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) + +# **updatePetWithForm** +> updatePetWithForm() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUpdatePetWithFormRequest = { + // number | ID of pet that needs to be updated + petId: 1, + // string | Updated name of the pet (optional) + name: "name_example", + // string | Updated status of the pet (optional) + status: "status_example", +}; + +apiInstance.updatePetWithForm(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet that needs to be updated | defaults to undefined + **name** | [**string**] | Updated name of the pet | (optional) defaults to undefined + **status** | [**string**] | Updated status of the pet | (optional) defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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) + +# **uploadFile** +> ApiResponse uploadFile() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.PetApi(configuration); + +let body:petstore.PetApiUploadFileRequest = { + // number | ID of pet to update + petId: 1, + // string | Additional data to pass to server (optional) + additionalMetadata: "additionalMetadata_example", + // HttpFile | file to upload (optional) + file: { data: Buffer.from(fs.readFileSync('/path/to/file', 'utf-8')), name: '/path/to/file' }, +}; + +apiInstance.uploadFile(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | [**number**] | ID of pet to update | defaults to undefined + **additionalMetadata** | [**string**] | Additional data to pass to server | (optional) defaults to undefined + **file** | [**HttpFile**] | file to upload | (optional) defaults to undefined + + +### Return type + +**ApiResponse** + +### Authorization + +[petstore_auth](README.md#petstore_auth) + +### HTTP request headers + + - **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/typescript/builds/object_params/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md new file mode 100644 index 00000000000..b2a63f78219 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md @@ -0,0 +1,233 @@ +# petstore.StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +# **deleteOrder** +> deleteOrder() + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiDeleteOrderRequest = { + // string | ID of the order that needs to be deleted + orderId: "orderId_example", +}; + +apiInstance.deleteOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**string**] | ID of the order that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **getInventory** +> { [key: string]: number; } getInventory() + +Returns a map of status codes to quantities + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:any = {}; + +apiInstance.getInventory(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +**{ [key: string]: number; }** + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getOrderById** +> Order getOrderById() + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiGetOrderByIdRequest = { + // number | ID of pet that needs to be fetched + orderId: 1, +}; + +apiInstance.getOrderById(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | [**number**] | ID of pet that needs to be fetched | defaults to undefined + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **placeOrder** +> Order placeOrder(order) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.StoreApi(configuration); + +let body:petstore.StoreApiPlaceOrderRequest = { + // Order | order placed for purchasing the pet + order: { + id: 1, + petId: 1, + quantity: 1, + shipDate: new Date('1970-01-01T00:00:00.00Z'), + status: "placed", + complete: false, + }, +}; + +apiInstance.placeOrder(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | **Order**| order placed for purchasing the pet | + + +### Return type + +**Order** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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/typescript/builds/object_params/UserApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/UserApi.md new file mode 100644 index 00000000000..e5ac670bd7c --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/UserApi.md @@ -0,0 +1,489 @@ +# petstore.UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +# **createUser** +> createUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUserRequest = { + // User | Created user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.createUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Created user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithArrayInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithArrayInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **createUsersWithListInput** +> createUsersWithListInput(user) + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiCreateUsersWithListInputRequest = { + // Array | List of user object + user: [ + { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, + ], +}; + +apiInstance.createUsersWithListInput(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **Array**| List of user object | + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **deleteUser** +> deleteUser() + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiDeleteUserRequest = { + // string | The name that needs to be deleted + username: "username_example", +}; + +apiInstance.deleteUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **getUserByName** +> User getUserByName() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiGetUserByNameRequest = { + // string | The name that needs to be fetched. Use user1 for testing. + username: "username_example", +}; + +apiInstance.getUserByName(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The name that needs to be fetched. Use user1 for testing. | defaults to undefined + + +### Return type + +**User** + +### Authorization + +No authorization required + +### HTTP request headers + + - **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) + +# **loginUser** +> string loginUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiLoginUserRequest = { + // string | The user name for login + username: "CbUUGjjNSwg0_bs9ZayIMrKdgNvb6gvxmPb9GcsM61ate1RA89q3w1l4eH4XxEz.5awLMdeXylwK0lMGUSM4jsrh4dstlnQUN5vVdMLPA", + // string | The password for login in clear text + password: "password_example", +}; + +apiInstance.loginUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | [**string**] | The user name for login | defaults to undefined + **password** | [**string**] | The password for login in clear text | defaults to undefined + + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Set-Cookie - Cookie authentication key for use with the `api_key` apiKey authentication.
                        * X-Rate-Limit - calls per hour allowed by the user
                        * X-Expires-After - date in UTC when toekn 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) + +# **logoutUser** +> logoutUser() + + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:any = {}; + +apiInstance.logoutUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters +This endpoint does not need any parameter. + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + +# **updateUser** +> updateUser(user) + +This can only be done by the logged in user. + +### Example + + +```typescript +import { petstore } from 'ts-petstore-client'; +import * as fs from 'fs'; + +const configuration = petstore.createConfiguration(); +const apiInstance = new petstore.UserApi(configuration); + +let body:petstore.UserApiUpdateUserRequest = { + // string | name that need to be deleted + username: "username_example", + // User | Updated user object + user: { + id: 1, + username: "username_example", + firstName: "firstName_example", + lastName: "lastName_example", + email: "email_example", + password: "password_example", + phone: "phone_example", + userStatus: 1, + }, +}; + +apiInstance.updateUser(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | **User**| Updated user object | + **username** | [**string**] | name that need to be deleted | defaults to undefined + + +### Return type + +void (empty response body) + +### Authorization + +[api_key](README.md#api_key) + +### HTTP request headers + + - **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) + + From ccccb6aa675b67349bc4a52286f134cd4a043a98 Mon Sep 17 00:00:00 2001 From: Tino Fuhrmann Date: Sat, 7 Aug 2021 23:48:41 +0200 Subject: [PATCH 48/72] Add missing samples for #9857 --- .../composed-schemas/.openapi-generator/FILES | 1 + .../builds/composed-schemas/DefaultApi.md | 173 ++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 samples/openapi3/client/petstore/typescript/builds/composed-schemas/DefaultApi.md diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES index 3647b2a71bd..94616002ccf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES @@ -1,4 +1,5 @@ .gitignore +DefaultApi.md README.md apis/DefaultApi.ts apis/baseapi.ts diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/DefaultApi.md b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/DefaultApi.md new file mode 100644 index 00000000000..a9df332ad47 --- /dev/null +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/DefaultApi.md @@ -0,0 +1,173 @@ +# .DefaultApi + +All URIs are relative to *http://api.example.xyz/v1* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**filePost**](DefaultApi.md#filePost) | **POST** /file | +[**petsFilteredPatch**](DefaultApi.md#petsFilteredPatch) | **PATCH** /pets-filtered | +[**petsPatch**](DefaultApi.md#petsPatch) | **PATCH** /pets | + + +# **filePost** +> void filePost() + + +### Example + + +```typescript +import { } from ''; +import * as fs from 'fs'; + +const configuration = .createConfiguration(); +const apiInstance = new .DefaultApi(configuration); + +let body:.DefaultApiFilePostRequest = { + // InlineObject (optional) + inlineObject: { + file: , + }, +}; + +apiInstance.filePost(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **inlineObject** | **InlineObject**| | + + +### Return type + +**void** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | File uploaded | - | + +[[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) + +# **petsFilteredPatch** +> void petsFilteredPatch() + + +### Example + + +```typescript +import { } from ''; +import * as fs from 'fs'; + +const configuration = .createConfiguration(); +const apiInstance = new .DefaultApi(configuration); + +let body:.DefaultApiPetsFilteredPatchRequest = { + // PetByAge | PetByType (optional) + petByAgePetByType: , +}; + +apiInstance.petsFilteredPatch(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petByAgePetByType** | **PetByAge | PetByType**| | + + +### Return type + +**void** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Updated | - | + +[[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) + +# **petsPatch** +> void petsPatch() + + +### Example + + +```typescript +import { } from ''; +import * as fs from 'fs'; + +const configuration = .createConfiguration(); +const apiInstance = new .DefaultApi(configuration); + +let body:.DefaultApiPetsPatchRequest = { + // Cat | Dog (optional) + catDog: , +}; + +apiInstance.petsPatch(body).then((data:any) => { + console.log('API called successfully. Returned data: ' + data); +}).catch((error:any) => console.error(error)); +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **catDog** | **Cat | Dog**| | + + +### Return type + +**void** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Updated | - | + +[[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) + + From 664aa2d946236ce327cf56256947baeb68f828e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20M=C3=B8ller?= <42833298+JohnTraDolta@users.noreply.github.com> Date: Sun, 8 Aug 2021 20:48:00 +0200 Subject: [PATCH 49/72] Fix issue 10020: [BUG] [typescript-angular] Add "header" to reserved words (#10091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename queryParameters to localVarQueryParameters * Rename headers to localVarHeaders * Rename credential to localVarCredential * Rename httpHeaderAcceptSelected to localVarHttpHeaderAcceptSelected * Rename formParams to localVarFormParams * Rename useForm to localVarUseForm * Rename convertFormParamsToString to localVarConvertFormParamsToString * Step 3 * update doc Co-authored-by: Marius Møller Co-authored-by: William Cheng --- .../typescript-angular/api.service.mustache | 84 +++--- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../builds/default/api/default.service.ts | 16 +- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../api/pet.service.ts | 253 ++++++++---------- .../api/store.service.ts | 74 ++--- .../api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- .../api/pet.service.ts | 253 ++++++++---------- .../api/store.service.ts | 74 ++--- .../api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/default/api/pet.service.ts | 253 ++++++++---------- .../builds/default/api/store.service.ts | 74 ++--- .../builds/default/api/user.service.ts | 144 +++++----- .../builds/with-npm/api/pet.service.ts | 253 ++++++++---------- .../builds/with-npm/api/store.service.ts | 74 ++--- .../builds/with-npm/api/user.service.ts | 144 +++++----- 56 files changed, 4154 insertions(+), 4424 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache index 4fe3186f1ad..c28e94db5ad 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache @@ -178,23 +178,23 @@ export class {{classname}} { {{/allParams}} {{#hasQueryParams}} - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); {{#queryParams}} {{#isArray}} if ({{paramName}}) { {{#isQueryParamObjectFormatJson}} - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, {{paramName}}, '{{baseName}}'); {{/isQueryParamObjectFormatJson}} {{^isQueryParamObjectFormatJson}} {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, element, '{{baseName}}'); }) {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']), '{{baseName}}'); {{/isCollectionFormatMulti}} {{/isQueryParamObjectFormatJson}} @@ -202,68 +202,68 @@ export class {{classname}} { {{/isArray}} {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, {{paramName}}, '{{baseName}}'); } {{/isArray}} {{/queryParams}} {{/hasQueryParams}} - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; {{#headerParams}} {{#isArray}} if ({{paramName}}) { - headers = headers.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); + localVarHeaders = localVarHeaders.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); } {{/isArray}} {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { - headers = headers.set('{{baseName}}', String({{paramName}})); + localVarHeaders = localVarHeaders.set('{{baseName}}', String({{paramName}})); } {{/isArray}} {{/headerParams}} {{#authMethods}} {{#-first}} - let credential: string | undefined; + let localVarCredential: string | undefined; {{/-first}} // authentication ({{name}}) required - credential = this.configuration.lookupCredential('{{name}}'); - if (credential) { + localVarCredential = this.configuration.lookupCredential('{{name}}'); + if (localVarCredential) { {{#isApiKey}} {{#isKeyInHeader}} - headers = headers.set('{{keyParamName}}', credential); + localVarHeaders = localVarHeaders.set('{{keyParamName}}', localVarCredential); {{/isKeyInHeader}} {{#isKeyInQuery}} - queryParameters = queryParameters.set('{{keyParamName}}', credential); + localVarQueryParameters = localVarQueryParameters.set('{{keyParamName}}', localVarCredential); {{/isKeyInQuery}} {{/isApiKey}} {{#isBasic}} {{#isBasicBasic}} - headers = headers.set('Authorization', 'Basic ' + credential); + localVarHeaders = localVarHeaders.set('Authorization', 'Basic ' + localVarCredential); {{/isBasicBasic}} {{#isBasicBearer}} - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); {{/isBasicBearer}} {{/isBasic}} {{#isOAuth}} - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); {{/isOAuth}} } {{/authMethods}} - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ {{#produces}} '{{{mediaType}}}'{{^-last}},{{/-last}} {{/produces}} ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } {{#bodyParam}} @@ -288,68 +288,68 @@ export class {{classname}} { {{#bodyParam}} const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } {{/bodyParam}} {{#hasFormParams}} const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; -{{#formParams}} + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; +{{#localVarFormParams}} {{#isFile}} // use FormData to transmit files using content-type "multipart/form-data" // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; + localVarUseForm = canConsumeForm; {{/isFile}} -{{/formParams}} - if (useForm) { - formParams = new FormData(); +{{/localVarFormParams}} + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } -{{#formParams}} +{{#localVarFormParams}} {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { - formParams = formParams.append('{{baseName}}', element) as any || formParams; + localVarFormParams = localVarFormParams.append('{{baseName}}', element) as any || localVarFormParams; }) {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} - if (useForm) { + if (localVarUseForm) { {{paramName}}.forEach((element) => { - formParams = formParams.append('{{baseName}}', element) as any || formParams; + localVarFormParams = localVarFormParams.append('{{baseName}}', element) as any || localVarFormParams; }) } else { - formParams = formParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])) as any || formParams; + localVarFormParams = localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])) as any || localVarFormParams; } {{/isCollectionFormatMulti}} } {{/isArray}} {{^isArray}} if ({{paramName}} !== undefined) { - formParams = formParams.append('{{baseName}}', {{^isModel}}{{paramName}}{{/isModel}}{{#isModel}}useForm ? new Blob([JSON.stringify({{paramName}})], {type: 'application/json'}) : {{paramName}}{{/isModel}}) as any || formParams; + localVarFormParams = localVarFormParams.append('{{baseName}}', {{^isModel}}{{paramName}}{{/isModel}}{{#isModel}}localVarUseForm ? new Blob([JSON.stringify({{paramName}})], {type: 'application/json'}) : {{paramName}}{{/isModel}}) as any || localVarFormParams; } {{/isArray}} -{{/formParams}} +{{/localVarFormParams}} {{/hasFormParams}} {{^isResponseFile}} let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } {{/isResponseFile}} return this.httpClient.{{httpMethod}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}(`${this.configuration.basePath}{{{path}}}`,{{#isBodyAllowed}} - {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}} + {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}} { {{#hasQueryParams}} - params: queryParameters, + params: localVarQueryParameters, {{/hasQueryParams}} {{#isResponseFile}} responseType: "blob", @@ -358,7 +358,7 @@ export class {{classname}} { responseType: responseType_, {{/isResponseFile}} withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/api/default.service.ts b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/api/default.service.ts index a008d370d56..e231755cb80 100644 --- a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/api/default.service.ts +++ b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/api/default.service.ts @@ -93,23 +93,23 @@ export class DefaultService { public rootGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public rootGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -117,7 +117,7 @@ export class DefaultService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts index ed90e6997ca..eae955ed578 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts @@ -110,24 +110,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -138,11 +138,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -151,7 +151,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -173,32 +173,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -206,7 +206,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -228,46 +228,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -290,46 +290,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,31 +351,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -383,7 +383,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,24 +404,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -432,11 +432,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -445,7 +445,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -468,24 +468,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -495,33 +495,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -544,25 +538,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -572,36 +566,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts index fa2273028cd..5341b196bb4 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts @@ -97,22 +97,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -120,7 +120,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -138,30 +138,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -169,7 +169,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -191,24 +191,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -216,7 +216,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -237,19 +237,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -258,11 +258,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -271,7 +271,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts index b4620030f1e..3cfe5b85f84 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts @@ -97,17 +97,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -116,11 +116,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -129,7 +129,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -150,17 +150,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -169,11 +169,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -182,7 +182,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -203,17 +203,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -222,11 +222,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -235,7 +235,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -257,22 +257,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -280,7 +280,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -301,24 +301,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -326,7 +326,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,43 +351,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,22 +404,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -427,7 +427,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -453,17 +453,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -472,11 +472,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -485,7 +485,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts index ed90e6997ca..eae955ed578 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts @@ -110,24 +110,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -138,11 +138,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -151,7 +151,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -173,32 +173,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -206,7 +206,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -228,46 +228,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -290,46 +290,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,31 +351,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -383,7 +383,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,24 +404,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -432,11 +432,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -445,7 +445,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -468,24 +468,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -495,33 +495,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -544,25 +538,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -572,36 +566,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts index fa2273028cd..5341b196bb4 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts @@ -97,22 +97,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -120,7 +120,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -138,30 +138,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -169,7 +169,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -191,24 +191,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -216,7 +216,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -237,19 +237,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -258,11 +258,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -271,7 +271,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts index b4620030f1e..3cfe5b85f84 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts @@ -97,17 +97,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -116,11 +116,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -129,7 +129,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -150,17 +150,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -169,11 +169,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -182,7 +182,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -203,17 +203,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -222,11 +222,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -235,7 +235,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -257,22 +257,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -280,7 +280,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -301,24 +301,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -326,7 +326,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,43 +351,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,22 +404,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -427,7 +427,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -453,17 +453,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -472,11 +472,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -485,7 +485,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts index ed90e6997ca..eae955ed578 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts @@ -110,24 +110,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -138,11 +138,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -151,7 +151,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -173,32 +173,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -206,7 +206,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -228,46 +228,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -290,46 +290,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,31 +351,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -383,7 +383,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,24 +404,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -432,11 +432,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -445,7 +445,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -468,24 +468,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -495,33 +495,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -544,25 +538,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -572,36 +566,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts index fa2273028cd..5341b196bb4 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts @@ -97,22 +97,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -120,7 +120,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -138,30 +138,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -169,7 +169,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -191,24 +191,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -216,7 +216,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -237,19 +237,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -258,11 +258,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -271,7 +271,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts index b4620030f1e..3cfe5b85f84 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts @@ -97,17 +97,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -116,11 +116,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -129,7 +129,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -150,17 +150,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -169,11 +169,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -182,7 +182,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -203,17 +203,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -222,11 +222,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -235,7 +235,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -257,22 +257,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -280,7 +280,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -301,24 +301,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -326,7 +326,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,43 +351,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,22 +404,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -427,7 +427,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -453,17 +453,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -472,11 +472,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -485,7 +485,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts index ed90e6997ca..eae955ed578 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts @@ -110,24 +110,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -138,11 +138,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -151,7 +151,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -173,32 +173,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -206,7 +206,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -228,46 +228,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -290,46 +290,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,31 +351,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -383,7 +383,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,24 +404,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -432,11 +432,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -445,7 +445,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -468,24 +468,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -495,33 +495,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -544,25 +538,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -572,36 +566,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts index fa2273028cd..5341b196bb4 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts @@ -97,22 +97,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -120,7 +120,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -138,30 +138,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -169,7 +169,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -191,24 +191,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -216,7 +216,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -237,19 +237,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -258,11 +258,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -271,7 +271,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts index b4620030f1e..3cfe5b85f84 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts @@ -97,17 +97,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -116,11 +116,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -129,7 +129,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -150,17 +150,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -169,11 +169,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -182,7 +182,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -203,17 +203,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -222,11 +222,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -235,7 +235,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -257,22 +257,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -280,7 +280,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -301,24 +301,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -326,7 +326,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -351,43 +351,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -404,22 +404,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -427,7 +427,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -453,17 +453,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -472,11 +472,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -485,7 +485,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/pet.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/pet.service.ts index 6b578e21b03..f9f98dc23e1 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/pet.service.ts @@ -162,24 +162,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -190,11 +190,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -203,7 +203,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -226,32 +226,32 @@ export class PetService { } const apiKey = requestParameters.apiKey; - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -259,7 +259,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -282,46 +282,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -345,46 +345,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -407,31 +407,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -439,7 +439,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -461,24 +461,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -489,11 +489,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -502,7 +502,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -526,24 +526,24 @@ export class PetService { const name = requestParameters.name; const status = requestParameters.status; - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -553,33 +553,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -603,25 +597,25 @@ export class PetService { const additionalMetadata = requestParameters.additionalMetadata; const file = requestParameters.file; - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -631,36 +625,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/store.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/store.service.ts index abce4984014..ba79a8d2e3b 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/store.service.ts @@ -115,22 +115,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -138,7 +138,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -156,30 +156,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -187,7 +187,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -210,24 +210,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -235,7 +235,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -257,19 +257,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -278,11 +278,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -291,7 +291,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/user.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/user.service.ts index 71fe4e00ca8..ba0bc83e7c1 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api/user.service.ts @@ -139,17 +139,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -158,11 +158,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,17 +193,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -212,11 +212,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -225,7 +225,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -247,17 +247,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -266,11 +266,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -279,7 +279,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -302,22 +302,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -325,7 +325,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -347,24 +347,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -372,7 +372,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -398,43 +398,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -451,22 +451,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -474,7 +474,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -501,17 +501,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -520,11 +520,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -533,7 +533,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/pet.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/pet.service.ts index 49c9abd5616..12a9f23e595 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/store.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/store.service.ts index 8fc7fb96077..3fc937d91e6 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/user.service.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/user.service.ts index 7fe91c765d3..f32cca84d40 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts index 4aa8f7744b0..0f1fde8770d 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/store.service.ts index 0f92dfa8338..a4d3b38989c 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/user.service.ts index 075b99ad7b1..fe1359f3759 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts index 086caf49ca0..56ec7b325f6 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts @@ -112,24 +112,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling addPet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -140,11 +140,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -153,7 +153,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -175,32 +175,32 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; if (apiKey !== undefined && apiKey !== null) { - headers = headers.set('api_key', String(apiKey)); + localVarHeaders = localVarHeaders.set('api_key', String(apiKey)); } - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -208,7 +208,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -230,46 +230,46 @@ export class PetService { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, status.join(COLLECTION_FORMATS['csv']), 'status'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByStatus`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -292,46 +292,46 @@ export class PetService { throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, tags.join(COLLECTION_FORMATS['csv']), 'tags'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get>(`${this.configuration.basePath}/pet/findByTags`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,31 +353,31 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -385,7 +385,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,24 +406,24 @@ export class PetService { throw new Error('Required parameter body was null or undefined when calling updatePet.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -434,11 +434,11 @@ export class PetService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -447,7 +447,7 @@ export class PetService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -470,24 +470,24 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -497,33 +497,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (name !== undefined) { - formParams = formParams.append('name', name) as any || formParams; - } - if (status !== undefined) { - formParams = formParams.append('status', status) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -546,25 +540,25 @@ export class PetService { throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (petstore_auth) required - credential = this.configuration.lookupCredential('petstore_auth'); - if (credential) { - headers = headers.set('Authorization', 'Bearer ' + credential); + localVarCredential = this.configuration.lookupCredential('petstore_auth'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } // to determine the Content-Type header @@ -574,36 +568,27 @@ export class PetService { const canConsumeForm = this.canConsumeForm(consumes); - let formParams: { append(param: string, value: any): any; }; - let useForm = false; - let convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); + let localVarFormParams: { append(param: string, value: any): any; }; + let localVarUseForm = false; + let localVarConvertFormParamsToString = false; + if (localVarUseForm) { + localVarFormParams = new FormData(); } else { - formParams = new HttpParams({encoder: this.encoder}); + localVarFormParams = new HttpParams({encoder: this.encoder}); } - if (additionalMetadata !== undefined) { - formParams = formParams.append('additionalMetadata', additionalMetadata) as any || formParams; - } - if (file !== undefined) { - formParams = formParams.append('file', file) as any || formParams; - } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.post(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, - convertFormParamsToString ? formParams.toString() : formParams, + localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams, { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/store.service.ts index bba871aa56a..359815fbd3a 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/store.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/store.service.ts @@ -99,22 +99,22 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -122,7 +122,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -140,30 +140,30 @@ export class StoreService { public getInventory(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json'}): Observable>; public getInventory(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json'}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let credential: string | undefined; + let localVarCredential: string | undefined; // authentication (api_key) required - credential = this.configuration.lookupCredential('api_key'); - if (credential) { - headers = headers.set('api_key', credential); + localVarCredential = this.configuration.lookupCredential('api_key'); + if (localVarCredential) { + localVarHeaders = localVarHeaders.set('api_key', localVarCredential); } - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -171,7 +171,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -193,24 +193,24 @@ export class StoreService { throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -218,7 +218,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -239,19 +239,19 @@ export class StoreService { throw new Error('Required parameter body was null or undefined when calling placeOrder.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -260,11 +260,11 @@ export class StoreService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -273,7 +273,7 @@ export class StoreService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/user.service.ts index f18f924de6c..5c774dfb63c 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/user.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/user.service.ts @@ -99,17 +99,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -118,11 +118,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -131,7 +131,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -152,17 +152,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -171,11 +171,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -184,7 +184,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -205,17 +205,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -224,11 +224,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -237,7 +237,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -259,22 +259,22 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -282,7 +282,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -303,24 +303,24 @@ export class UserService { throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -328,7 +328,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -353,43 +353,43 @@ export class UserService { throw new Error('Required parameter password was null or undefined when calling loginUser.'); } - let queryParameters = new HttpParams({encoder: this.encoder}); + let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (username !== undefined && username !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, username, 'username'); } if (password !== undefined && password !== null) { - queryParameters = this.addToHttpParams(queryParameters, + localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, password, 'password'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ 'application/xml', 'application/json' ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } return this.httpClient.get(`${this.configuration.basePath}/user/login`, { - params: queryParameters, + params: localVarQueryParameters, responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -406,22 +406,22 @@ export class UserService { public logoutUser(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined}): Observable>; public logoutUser(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined}): Observable { - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -429,7 +429,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } @@ -455,17 +455,17 @@ export class UserService { throw new Error('Required parameter body was null or undefined when calling updateUser.'); } - let headers = this.defaultHeaders; + let localVarHeaders = this.defaultHeaders; - let httpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; - if (httpHeaderAcceptSelected === undefined) { + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { // to determine the Accept header const httpHeaderAccepts: string[] = [ ]; - httpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); } - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); } @@ -474,11 +474,11 @@ export class UserService { ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); } let responseType_: 'text' | 'json' = 'json'; - if(httpHeaderAcceptSelected && httpHeaderAcceptSelected.startsWith('text')) { + if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) { responseType_ = 'text'; } @@ -487,7 +487,7 @@ export class UserService { { responseType: responseType_, withCredentials: this.configuration.withCredentials, - headers: headers, + localVarHeaders: localVarHeaders, observe: observe, reportProgress: reportProgress } From d0788cdbc18bb431c457b0d1c5535e8443b84cc1 Mon Sep 17 00:00:00 2001 From: Marley <55280588+marleypowell@users.noreply.github.com> Date: Tue, 10 Aug 2021 14:00:57 +0200 Subject: [PATCH 50/72] Typescript-angular: Added missing semi colon to interface export in `apis.ts` template file. (#10121) --- .../src/main/resources/typescript-angular/apis.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/apis.mustache index 514b5e0d10f..ad8785cf8cd 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/apis.mustache @@ -5,7 +5,7 @@ export * from './{{ classFilename }}'; import { {{ classname }} } from './{{ classFilename }}'; {{/operations}} {{#withInterfaces}} -export * from './{{ classFilename }}Interface' +export * from './{{ classFilename }}Interface'; {{/withInterfaces}} {{/apis}} export const APIS = [{{#apis}}{{#operations}}{{ classname }}{{/operations}}{{^-last}}, {{/-last}}{{/apis}}]; From f9dd44845108c4684e8130e3aa66871b5333736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sampo=20Kivist=C3=B6?= Date: Wed, 11 Aug 2021 05:58:58 +0300 Subject: [PATCH 51/72] Fixed typo in csharp-netcore httpclient generated code (#10119) --- .../csharp-netcore/libraries/httpclient/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache index e9c39ea9f6d..027fc537743 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache @@ -158,7 +158,7 @@ namespace {{packageName}}.Client } } /// - /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios), + /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations), /// encapsulating general REST accessor use cases. /// /// From 7dcca2e8910dfdb1e115f9599b9081643012f681 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 11 Aug 2021 12:10:37 +0800 Subject: [PATCH 52/72] update samples --- .../src/Org.OpenAPITools/Client/ApiClient.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs index 364fe9d25aa..6ad76521d16 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs @@ -158,7 +158,7 @@ namespace Org.OpenAPITools.Client } } /// - /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios), + /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations), /// encapsulating general REST accessor use cases. /// /// From bd8efe2f91761df866489c16e1c17870a8c88c5f Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Wed, 11 Aug 2021 21:12:46 +0800 Subject: [PATCH 53/72] [C][Client] Allocate memory for the element of array when the type is number (#10124) --- .../src/main/resources/C-libcurl/model-body.mustache | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index a962081a46d..ae52b8c30b1 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -666,7 +666,13 @@ fail: { goto end; } - list_addElement({{{name}}}List , &{{{name}}}_local->valuedouble); + double *{{{name}}}_local_value = (double *)calloc(1, sizeof(double)); + if(!{{{name}}}_local_value) + { + goto end; + } + *{{{name}}}_local_value = {{{name}}}_local->valuedouble; + list_addElement({{{name}}}List , {{{name}}}_local_value); {{/isNumeric}} {{#isBoolean}} if(!cJSON_IsBool({{{name}}}_local)) From c58326ad2f5e9da8cf2562fa4919146e236a317b Mon Sep 17 00:00:00 2001 From: Richard Kolkovich Date: Thu, 12 Aug 2021 22:10:34 -0600 Subject: [PATCH 54/72] add my companies to README (#10146) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9bfd915f439..1443b332630 100644 --- a/README.md +++ b/README.md @@ -599,6 +599,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [Cupix](https://www.cupix.com/) - [Datadog](https://www.datadoghq.com) - [DB Systel](https://www.dbsystel.de) +- [Devsupply](https://www.devsupply.com/) - [DocSpring](https://docspring.com/) - [dwango](https://dwango.co.jp/) - [Edge Impulse](https://www.edgeimpulse.com/) @@ -633,6 +634,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [MoonVision](https://www.moonvision.io/) - [Myworkout](https://myworkout.com) - [NamSor](https://www.namsor.com/) +- [Neverfail](https://www.neverfail.com/) - [Nokia](https://www.nokia.com/) - [Options Clearing Corporation (OCC)](https://www.theocc.com/) - [Openet](https://www.openet.com/) From 6a9c8077e1ecb48c454c62b2c9c8aa0cd8a1943f Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:13:28 +0800 Subject: [PATCH 55/72] Add Inquisico to list of generator users (#10142) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1443b332630..d4e2056ddde 100644 --- a/README.md +++ b/README.md @@ -619,6 +619,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [Here](https://developer.here.com/) - [IBM](https://www.ibm.com/) - [Instana](https://www.instana.com) +- [Inquisico](https://inquisico.com) - [JustStar](https://www.juststarinfo.com) - [k6.io](https://k6.io/) - [Klarna](https://www.klarna.com/) From c72e69f28a63acf8896b9a09910855e7f3ac8633 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Fri, 13 Aug 2021 06:57:30 +0200 Subject: [PATCH 56/72] [dart][dio] Update built_value to =>8.1.0 (#10122) --- .../src/main/resources/dart/libraries/dio/pubspec.mustache | 6 +++--- .../libraries/dio/serialization/built_value/class.mustache | 3 ++- .../lib/src/model/additional_properties_class.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/animal.dart | 3 ++- .../lib/src/model/api_response.dart | 3 ++- .../lib/src/model/array_of_array_of_number_only.dart | 3 ++- .../lib/src/model/array_of_number_only.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/array_test.dart | 3 ++- .../lib/src/model/capitalization.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/cat.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/cat_all_of.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/category.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/class_model.dart | 3 ++- .../lib/src/model/deprecated_object.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/dog.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/dog_all_of.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/enum_arrays.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/enum_test.dart | 3 ++- .../lib/src/model/file_schema_test_class.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/foo.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/format_test.dart | 3 ++- .../lib/src/model/has_only_read_only.dart | 3 ++- .../lib/src/model/health_check_result.dart | 3 ++- .../lib/src/model/inline_response_default.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/map_test.dart | 3 ++- .../mixed_properties_and_additional_properties_class.dart | 3 ++- .../lib/src/model/model200_response.dart | 3 ++- .../lib/src/model/model_client.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/model_file.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/model_list.dart | 3 ++- .../lib/src/model/model_return.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/name.dart | 3 ++- .../lib/src/model/nullable_class.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/number_only.dart | 3 ++- .../lib/src/model/object_with_deprecated_fields.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/order.dart | 3 ++- .../lib/src/model/outer_composite.dart | 3 ++- .../lib/src/model/outer_object_with_enum_property.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/pet.dart | 3 ++- .../lib/src/model/read_only_first.dart | 3 ++- .../lib/src/model/special_model_name.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/tag.dart | 3 ++- .../petstore_client_lib_fake/lib/src/model/user.dart | 3 ++- .../dart-dio-next/petstore_client_lib_fake/pubspec.yaml | 6 +++--- .../dart-dio-next/petstore_client_lib_fake_tests/.gitignore | 1 + .../petstore_client_lib_fake_tests/pubspec.lock | 4 ++-- .../petstore_client_lib_fake_tests/pubspec.yaml | 4 ++-- 47 files changed, 95 insertions(+), 52 deletions(-) create mode 100644 samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/.gitignore diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache index 991de1e44b5..6bf879a4897 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache @@ -9,8 +9,8 @@ environment: dependencies: dio: '>=4.0.0 <5.0.0' {{#useBuiltValue}} - built_value: '>=8.0.4 <9.0.0' - built_collection: '>=5.0.0 <6.0.0' + built_value: '>=8.1.0 <9.0.0' + built_collection: '>=5.1.0 <6.0.0' {{/useBuiltValue}} {{#useDateLibTimeMachine}} time_machine: ^0.9.16 @@ -18,7 +18,7 @@ dependencies: dev_dependencies: {{#useBuiltValue}} - built_value_generator: '>=8.0.4 <9.0.0' + built_value_generator: '>=8.1.0 <9.0.0' build_runner: any {{/useBuiltValue}} test: '>=1.16.0 <1.17.0' diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache index 9eb53c756c7..816524bc73a 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache @@ -33,7 +33,8 @@ abstract class {{classname}} implements Built<{{classname}}, {{classname}}Builde {{/vars}} {{classname}}._(); - static void _initializeBuilder({{{classname}}}Builder b) => b{{#vars}}{{#defaultValue}} + @BuiltValueHook(initializeBuilder: true) + static void _defaults({{{classname}}}Builder b) => b{{#vars}}{{#defaultValue}} ..{{{name}}} = {{#isEnum}}{{^isContainer}}const {{{enumName}}}._({{/isContainer}}{{/isEnum}}{{{defaultValue}}}{{#isEnum}}{{^isContainer}}){{/isContainer}}{{/isEnum}}{{/defaultValue}}{{/vars}}; factory {{classname}}([void updates({{classname}}Builder b)]) = _${{classname}}; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/additional_properties_class.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/additional_properties_class.dart index 25e0fb4fdbf..e7499419d16 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/additional_properties_class.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/additional_properties_class.dart @@ -22,7 +22,8 @@ abstract class AdditionalPropertiesClass implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(AdditionalPropertiesClassBuilder b) => b; factory AdditionalPropertiesClass([void updates(AdditionalPropertiesClassBuilder b)]) = _$AdditionalPropertiesClass; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/animal.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/animal.dart index d51c6d7b0be..957b2e330b5 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/animal.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/animal.dart @@ -21,7 +21,8 @@ abstract class Animal implements Built { Animal._(); - static void _initializeBuilder(AnimalBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(AnimalBuilder b) => b ..color = 'red'; factory Animal([void updates(AnimalBuilder b)]) = _$Animal; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/api_response.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/api_response.dart index fc9554f36ce..a0902690b29 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/api_response.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/api_response.dart @@ -25,7 +25,8 @@ abstract class ApiResponse implements Built { ApiResponse._(); - static void _initializeBuilder(ApiResponseBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ApiResponseBuilder b) => b; factory ApiResponse([void updates(ApiResponseBuilder b)]) = _$ApiResponse; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_array_of_number_only.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_array_of_number_only.dart index 899697f7efc..45bc21b1972 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_array_of_number_only.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_array_of_number_only.dart @@ -18,7 +18,8 @@ abstract class ArrayOfArrayOfNumberOnly implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ArrayOfArrayOfNumberOnlyBuilder b) => b; factory ArrayOfArrayOfNumberOnly([void updates(ArrayOfArrayOfNumberOnlyBuilder b)]) = _$ArrayOfArrayOfNumberOnly; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_number_only.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_number_only.dart index 2e886df9b04..4de4528f47a 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_number_only.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_of_number_only.dart @@ -18,7 +18,8 @@ abstract class ArrayOfNumberOnly implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ArrayOfNumberOnlyBuilder b) => b; factory ArrayOfNumberOnly([void updates(ArrayOfNumberOnlyBuilder b)]) = _$ArrayOfNumberOnly; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_test.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_test.dart index 82ee6c2c01a..7e4a3e86d79 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_test.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/array_test.dart @@ -27,7 +27,8 @@ abstract class ArrayTest implements Built { ArrayTest._(); - static void _initializeBuilder(ArrayTestBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ArrayTestBuilder b) => b; factory ArrayTest([void updates(ArrayTestBuilder b)]) = _$ArrayTest; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/capitalization.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/capitalization.dart index fb1bfd7a5b9..eb793695fc0 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/capitalization.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/capitalization.dart @@ -38,7 +38,8 @@ abstract class Capitalization implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(CapitalizationBuilder b) => b; factory Capitalization([void updates(CapitalizationBuilder b)]) = _$Capitalization; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat.dart index fa9282bb8cb..f36e3b29532 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat.dart @@ -29,7 +29,8 @@ abstract class Cat implements Built { Cat._(); - static void _initializeBuilder(CatBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(CatBuilder b) => b ..color = 'red'; factory Cat([void updates(CatBuilder b)]) = _$Cat; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat_all_of.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat_all_of.dart index b8019b936d8..caac5bed6b9 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat_all_of.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat_all_of.dart @@ -17,7 +17,8 @@ abstract class CatAllOf implements Built { CatAllOf._(); - static void _initializeBuilder(CatAllOfBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(CatAllOfBuilder b) => b; factory CatAllOf([void updates(CatAllOfBuilder b)]) = _$CatAllOf; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/category.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/category.dart index 35184265992..f201eb85360 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/category.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/category.dart @@ -21,7 +21,8 @@ abstract class Category implements Built { Category._(); - static void _initializeBuilder(CategoryBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(CategoryBuilder b) => b ..name = 'default-name'; factory Category([void updates(CategoryBuilder b)]) = _$Category; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/class_model.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/class_model.dart index 7b99dc2be1a..09d29f9a1c4 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/class_model.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/class_model.dart @@ -17,7 +17,8 @@ abstract class ClassModel implements Built { ClassModel._(); - static void _initializeBuilder(ClassModelBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ClassModelBuilder b) => b; factory ClassModel([void updates(ClassModelBuilder b)]) = _$ClassModel; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/deprecated_object.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/deprecated_object.dart index 1913228ee64..24df5054e2e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/deprecated_object.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/deprecated_object.dart @@ -17,7 +17,8 @@ abstract class DeprecatedObject implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(DeprecatedObjectBuilder b) => b; factory DeprecatedObject([void updates(DeprecatedObjectBuilder b)]) = _$DeprecatedObject; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog.dart index 9ca43e05402..4d74773271c 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog.dart @@ -29,7 +29,8 @@ abstract class Dog implements Built { Dog._(); - static void _initializeBuilder(DogBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(DogBuilder b) => b ..color = 'red'; factory Dog([void updates(DogBuilder b)]) = _$Dog; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog_all_of.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog_all_of.dart index 291310df2c2..84f46a94c2e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog_all_of.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog_all_of.dart @@ -17,7 +17,8 @@ abstract class DogAllOf implements Built { DogAllOf._(); - static void _initializeBuilder(DogAllOfBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(DogAllOfBuilder b) => b; factory DogAllOf([void updates(DogAllOfBuilder b)]) = _$DogAllOf; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_arrays.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_arrays.dart index 0e28f7247a8..1a0715cec9c 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_arrays.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_arrays.dart @@ -24,7 +24,8 @@ abstract class EnumArrays implements Built { EnumArrays._(); - static void _initializeBuilder(EnumArraysBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(EnumArraysBuilder b) => b; factory EnumArrays([void updates(EnumArraysBuilder b)]) = _$EnumArrays; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_test.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_test.dart index 8e6d8c6d23e..3e8b11af09c 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_test.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_test.dart @@ -58,7 +58,8 @@ abstract class EnumTest implements Built { EnumTest._(); - static void _initializeBuilder(EnumTestBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(EnumTestBuilder b) => b; factory EnumTest([void updates(EnumTestBuilder b)]) = _$EnumTest; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/file_schema_test_class.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/file_schema_test_class.dart index 0fdd8367085..e1d8d69a801 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/file_schema_test_class.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/file_schema_test_class.dart @@ -23,7 +23,8 @@ abstract class FileSchemaTestClass implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(FileSchemaTestClassBuilder b) => b; factory FileSchemaTestClass([void updates(FileSchemaTestClassBuilder b)]) = _$FileSchemaTestClass; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/foo.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/foo.dart index 148b67aacea..57f00b80148 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/foo.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/foo.dart @@ -17,7 +17,8 @@ abstract class Foo implements Built { Foo._(); - static void _initializeBuilder(FooBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(FooBuilder b) => b ..bar = 'bar'; factory Foo([void updates(FooBuilder b)]) = _$Foo; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/format_test.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/format_test.dart index eb013af8673..bd46fac2690 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/format_test.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/format_test.dart @@ -81,7 +81,8 @@ abstract class FormatTest implements Built { FormatTest._(); - static void _initializeBuilder(FormatTestBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(FormatTestBuilder b) => b; factory FormatTest([void updates(FormatTestBuilder b)]) = _$FormatTest; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/has_only_read_only.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/has_only_read_only.dart index d1ed7b46954..f6842ea1b2f 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/has_only_read_only.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/has_only_read_only.dart @@ -21,7 +21,8 @@ abstract class HasOnlyReadOnly implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(HasOnlyReadOnlyBuilder b) => b; factory HasOnlyReadOnly([void updates(HasOnlyReadOnlyBuilder b)]) = _$HasOnlyReadOnly; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/health_check_result.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/health_check_result.dart index a071f956787..792be70831a 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/health_check_result.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/health_check_result.dart @@ -17,7 +17,8 @@ abstract class HealthCheckResult implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(HealthCheckResultBuilder b) => b; factory HealthCheckResult([void updates(HealthCheckResultBuilder b)]) = _$HealthCheckResult; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/inline_response_default.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/inline_response_default.dart index d6eb09c8797..310f41db64d 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/inline_response_default.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/inline_response_default.dart @@ -18,7 +18,8 @@ abstract class InlineResponseDefault implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(InlineResponseDefaultBuilder b) => b; factory InlineResponseDefault([void updates(InlineResponseDefaultBuilder b)]) = _$InlineResponseDefault; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/map_test.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/map_test.dart index 89fa1e3065e..ca1690b222c 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/map_test.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/map_test.dart @@ -31,7 +31,8 @@ abstract class MapTest implements Built { MapTest._(); - static void _initializeBuilder(MapTestBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(MapTestBuilder b) => b; factory MapTest([void updates(MapTestBuilder b)]) = _$MapTest; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/mixed_properties_and_additional_properties_class.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/mixed_properties_and_additional_properties_class.dart index 55328c39f6f..418536c869d 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/mixed_properties_and_additional_properties_class.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/mixed_properties_and_additional_properties_class.dart @@ -27,7 +27,8 @@ abstract class MixedPropertiesAndAdditionalPropertiesClass implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(MixedPropertiesAndAdditionalPropertiesClassBuilder b) => b; factory MixedPropertiesAndAdditionalPropertiesClass([void updates(MixedPropertiesAndAdditionalPropertiesClassBuilder b)]) = _$MixedPropertiesAndAdditionalPropertiesClass; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model200_response.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model200_response.dart index f8eaf0f3e2d..9cdc10da98f 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model200_response.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model200_response.dart @@ -21,7 +21,8 @@ abstract class Model200Response implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(Model200ResponseBuilder b) => b; factory Model200Response([void updates(Model200ResponseBuilder b)]) = _$Model200Response; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_client.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_client.dart index 045a6805707..13e81e6e43d 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_client.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_client.dart @@ -17,7 +17,8 @@ abstract class ModelClient implements Built { ModelClient._(); - static void _initializeBuilder(ModelClientBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ModelClientBuilder b) => b; factory ModelClient([void updates(ModelClientBuilder b)]) = _$ModelClient; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_file.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_file.dart index 2ad4601d2f0..2cfa1679267 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_file.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_file.dart @@ -18,7 +18,8 @@ abstract class ModelFile implements Built { ModelFile._(); - static void _initializeBuilder(ModelFileBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ModelFileBuilder b) => b; factory ModelFile([void updates(ModelFileBuilder b)]) = _$ModelFile; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_list.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_list.dart index 4bb83e5f277..c81df7af990 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_list.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_list.dart @@ -17,7 +17,8 @@ abstract class ModelList implements Built { ModelList._(); - static void _initializeBuilder(ModelListBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ModelListBuilder b) => b; factory ModelList([void updates(ModelListBuilder b)]) = _$ModelList; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_return.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_return.dart index 4e7bad16424..88a2cb3242f 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_return.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_return.dart @@ -17,7 +17,8 @@ abstract class ModelReturn implements Built { ModelReturn._(); - static void _initializeBuilder(ModelReturnBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ModelReturnBuilder b) => b; factory ModelReturn([void updates(ModelReturnBuilder b)]) = _$ModelReturn; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/name.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/name.dart index 1963c3ace07..50c1daf4d65 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/name.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/name.dart @@ -29,7 +29,8 @@ abstract class Name implements Built { Name._(); - static void _initializeBuilder(NameBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(NameBuilder b) => b; factory Name([void updates(NameBuilder b)]) = _$Name; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/nullable_class.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/nullable_class.dart index 30dc376cb02..3c10f87c0a7 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/nullable_class.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/nullable_class.dart @@ -64,7 +64,8 @@ abstract class NullableClass implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(NullableClassBuilder b) => b; factory NullableClass([void updates(NullableClassBuilder b)]) = _$NullableClass; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/number_only.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/number_only.dart index b423c6fc656..bb09dc5abd9 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/number_only.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/number_only.dart @@ -17,7 +17,8 @@ abstract class NumberOnly implements Built { NumberOnly._(); - static void _initializeBuilder(NumberOnlyBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(NumberOnlyBuilder b) => b; factory NumberOnly([void updates(NumberOnlyBuilder b)]) = _$NumberOnly; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/object_with_deprecated_fields.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/object_with_deprecated_fields.dart index 465fcd896d4..1440ee4761e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/object_with_deprecated_fields.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/object_with_deprecated_fields.dart @@ -31,7 +31,8 @@ abstract class ObjectWithDeprecatedFields implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ObjectWithDeprecatedFieldsBuilder b) => b; factory ObjectWithDeprecatedFields([void updates(ObjectWithDeprecatedFieldsBuilder b)]) = _$ObjectWithDeprecatedFields; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/order.dart index cdebcd96b1e..edcabc1e726 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/order.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/order.dart @@ -40,7 +40,8 @@ abstract class Order implements Built { Order._(); - static void _initializeBuilder(OrderBuilder b) => b + @BuiltValueHook(initializeBuilder: true) + static void _defaults(OrderBuilder b) => b ..complete = false; factory Order([void updates(OrderBuilder b)]) = _$Order; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_composite.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_composite.dart index 0a8f4296c13..50b397a9f6b 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_composite.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_composite.dart @@ -25,7 +25,8 @@ abstract class OuterComposite implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(OuterCompositeBuilder b) => b; factory OuterComposite([void updates(OuterCompositeBuilder b)]) = _$OuterComposite; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_object_with_enum_property.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_object_with_enum_property.dart index a95f92d8837..4cd5558ccbc 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_object_with_enum_property.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_object_with_enum_property.dart @@ -19,7 +19,8 @@ abstract class OuterObjectWithEnumProperty implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(OuterObjectWithEnumPropertyBuilder b) => b; factory OuterObjectWithEnumProperty([void updates(OuterObjectWithEnumPropertyBuilder b)]) = _$OuterObjectWithEnumProperty; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/pet.dart index ea94306056c..d25bc3ef2b0 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/pet.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/pet.dart @@ -42,7 +42,8 @@ abstract class Pet implements Built { Pet._(); - static void _initializeBuilder(PetBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(PetBuilder b) => b; factory Pet([void updates(PetBuilder b)]) = _$Pet; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/read_only_first.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/read_only_first.dart index ce46f919ea3..b24ce8f0db1 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/read_only_first.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/read_only_first.dart @@ -21,7 +21,8 @@ abstract class ReadOnlyFirst implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(ReadOnlyFirstBuilder b) => b; factory ReadOnlyFirst([void updates(ReadOnlyFirstBuilder b)]) = _$ReadOnlyFirst; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/special_model_name.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/special_model_name.dart index dc69b29e496..bb08953c02e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/special_model_name.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/special_model_name.dart @@ -17,7 +17,8 @@ abstract class SpecialModelName implements Built b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(SpecialModelNameBuilder b) => b; factory SpecialModelName([void updates(SpecialModelNameBuilder b)]) = _$SpecialModelName; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/tag.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/tag.dart index 6723a6ea9f2..c20a261021e 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/tag.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/tag.dart @@ -21,7 +21,8 @@ abstract class Tag implements Built { Tag._(); - static void _initializeBuilder(TagBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(TagBuilder b) => b; factory Tag([void updates(TagBuilder b)]) = _$Tag; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/user.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/user.dart index 8aeb8f43ade..f7150fa54b0 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/user.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/user.dart @@ -46,7 +46,8 @@ abstract class User implements Built { User._(); - static void _initializeBuilder(UserBuilder b) => b; + @BuiltValueHook(initializeBuilder: true) + static void _defaults(UserBuilder b) => b; factory User([void updates(UserBuilder b)]) = _$User; diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/pubspec.yaml b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/pubspec.yaml index 2a62f274f36..b7c55f4b712 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/pubspec.yaml +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/pubspec.yaml @@ -8,10 +8,10 @@ environment: dependencies: dio: '>=4.0.0 <5.0.0' - built_value: '>=8.0.4 <9.0.0' - built_collection: '>=5.0.0 <6.0.0' + built_value: '>=8.1.0 <9.0.0' + built_collection: '>=5.1.0 <6.0.0' dev_dependencies: - built_value_generator: '>=8.0.4 <9.0.0' + built_value_generator: '>=8.1.0 <9.0.0' build_runner: any test: '>=1.16.0 <1.17.0' diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/.gitignore b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/.gitignore new file mode 100644 index 00000000000..378eac25d31 --- /dev/null +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/.gitignore @@ -0,0 +1 @@ +build diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.lock b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.lock index da39b01528a..d551818e23c 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.lock +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.lock @@ -49,14 +49,14 @@ packages: name: built_collection url: "https://pub.intern.sk" source: hosted - version: "5.0.0" + version: "5.1.0" built_value: dependency: "direct dev" description: name: built_value url: "https://pub.intern.sk" source: hosted - version: "8.0.6" + version: "8.1.0" charcode: dependency: transitive description: diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.yaml b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.yaml index 2f7b39d4972..32bc7faead1 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.yaml +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake_tests/pubspec.yaml @@ -8,8 +8,8 @@ environment: sdk: '>=2.10.0 <3.0.0' dev_dependencies: - built_collection: 5.0.0 - built_value: 8.0.6 + built_collection: 5.1.0 + built_value: 8.1.0 dio: 4.0.0 http_mock_adapter: 0.3.2 mockito: 5.0.11 From 8ee400305bc583fc69e6d887fb6410069db05ba5 Mon Sep 17 00:00:00 2001 From: Ghufran Zahidi <18732053+Ghufz@users.noreply.github.com> Date: Fri, 13 Aug 2021 20:17:46 +0530 Subject: [PATCH 57/72] Fixed the utc time issue for httpSigning auth. (#10139) --- .../resources/csharp-netcore/HttpSigningConfiguration.mustache | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- .../src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache index cc8c275e40b..c762fda011f 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache @@ -193,7 +193,7 @@ namespace {{packageName}}.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index 1d2d0019cae..4ead821d7d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -193,7 +193,7 @@ namespace Org.OpenAPITools.Client } else if (header.Equals(HEADER_DATE)) { - var utcDateTime = dateTime.ToString("r").ToString(); + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); HttpSignatureHeader.Add(header.ToLower(), utcDateTime); HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); } From 55ff5a0807d3c2e134e9c0df32c4e98edb73a5c3 Mon Sep 17 00:00:00 2001 From: Ahmed Fwela <63286031+ahmednfwela@users.noreply.github.com> Date: Fri, 13 Aug 2021 17:16:09 +0200 Subject: [PATCH 58/72] Don't use encodeCollectionQueryParameter on maps (#10116) --- .../dio/serialization/built_value/query_param.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache index 06599a5ab4a..aa47f4f4394 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/query_param.mustache @@ -1 +1 @@ -{{#isContainer}}encodeCollectionQueryParameter<{{{baseType}}}>{{/isContainer}}{{^isContainer}}encodeQueryParameter{{/isContainer}}(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{dataType}}}){{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]), {{#collectionFormat}}format: ListFormat.{{collectionFormat}},{{/collectionFormat}}{{/isContainer}}) \ No newline at end of file +{{#isContainer}}{{#isMap}}encodeQueryParameter{{/isMap}}{{^isMap}}encodeCollectionQueryParameter<{{{baseType}}}>{{/isMap}}{{/isContainer}}{{^isContainer}}encodeQueryParameter{{/isContainer}}(_serializers, {{{paramName}}}, const FullType({{^isContainer}}{{{dataType}}}){{/isContainer}}{{#isContainer}}Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{baseType}}})]), {{#collectionFormat}}format: ListFormat.{{collectionFormat}},{{/collectionFormat}}{{/isContainer}}) \ No newline at end of file From 8569ff8203d89392fa32d3ecd6eca816331a7b65 Mon Sep 17 00:00:00 2001 From: shayan-eftekhari <86353115+shayan-eftekhari@users.noreply.github.com> Date: Sat, 14 Aug 2021 18:32:14 +0200 Subject: [PATCH 59/72] [cpp-pistache-server] Fix missing semicolon in template and missing code to set default values of model schema (#10136) * BUG FIX: A missing semicolon in cpp-pistache-server generated code. * BUG FIX: Provide default values of schema in cpp-pistache-server generated code. * BUG FIX: Provide default values of schema in cpp-pistache-server generated code. --- .../languages/CppPistacheServerCodegen.java | 77 ++++++++++++++----- .../cpp-pistache-server/api-source.mustache | 2 +- .../petstore/cpp-pistache/api/PetApi.cpp | 2 +- .../petstore/cpp-pistache/api/StoreApi.cpp | 2 +- .../petstore/cpp-pistache/api/UserApi.cpp | 2 +- 5 files changed, 61 insertions(+), 24 deletions(-) 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 18cfb324f9a..0aa6cb25685 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 @@ -381,42 +381,79 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public String toDefaultValue(Schema p) { - if (ModelUtils.isBooleanSchema(p)) { - return "false"; + if (ModelUtils.isStringSchema(p)) { + if (p.getDefault() != null) { + return "\"" + p.getDefault().toString() + "\""; + } else { + return "\"\""; + } + } else if (ModelUtils.isBooleanSchema(p)) { + if (p.getDefault() != null) { + return p.getDefault().toString(); + } else { + return "false"; + } } else if (ModelUtils.isDateSchema(p)) { - return "\"\""; + if (p.getDefault() != null) { + return "\"" + p.getDefault().toString() + "\""; + } else { + return "\"\""; + } } else if (ModelUtils.isDateTimeSchema(p)) { - return "\"\""; + if (p.getDefault() != null) { + return "\"" + p.getDefault().toString() + "\""; + } else { + return "\"\""; + } } else if (ModelUtils.isNumberSchema(p)) { - if (ModelUtils.isFloatSchema(p)) { - return "0.0f"; + if (ModelUtils.isFloatSchema(p)) { // float + if (p.getDefault() != null) { + return p.getDefault().toString() + "f"; + } else { + return "0.0f"; + } + } else { // double + if (p.getDefault() != null) { + return p.getDefault().toString(); + } else { + return "0.0"; + } } - return "0.0"; } else if (ModelUtils.isIntegerSchema(p)) { - if (ModelUtils.isLongSchema(p)) { - return "0L"; + if (ModelUtils.isLongSchema(p)) { // long + if (p.getDefault() != null) { + return p.getDefault().toString() + "L"; + } else { + return "0L"; + } + } else { // integer + if (p.getDefault() != null) { + return p.getDefault().toString(); + } else { + return "0"; + } } - return "0"; } else if (ModelUtils.isByteArraySchema(p)) { - return "\"\""; + if (p.getDefault() != null) { + return "\"" + p.getDefault().toString() + "\""; + } else { + return "\"\""; + } } else if (ModelUtils.isMapSchema(p)) { String inner = getSchemaType(getAdditionalProperties(p)); return "std::map()"; } else if (ModelUtils.isArraySchema(p)) { ArraySchema ap = (ArraySchema) p; String inner = getSchemaType(ap.getItems()); - return "std::vector<" + inner + ">()"; - } else if (!StringUtils.isEmpty(p.get$ref())) { // model - return toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()"; - } else if (ModelUtils.isStringSchema(p)) { - if (p.getDefault() == null) { - return "\"\""; - } else { - return "\"" + p.getDefault().toString() + "\""; + if (!languageSpecificPrimitives.contains(inner)) { + inner = "std::shared_ptr<" + inner + ">"; } + return "std::vector<" + inner + ">()"; + } else if (!StringUtils.isEmpty(p.get$ref())) { + return "std::make_shared<" + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + ">()"; } - return ""; + return "nullptr"; } /** diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache index dad2eb75c6c..7418caa9cdd 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache @@ -42,7 +42,7 @@ std::pair {{classname}}::handleParsingExcepti } catch ({{helpersNamespace}}::ValidationException &e) { return std::make_pair(Pistache::Http::Code::Bad_Request, e.what()); } catch (std::exception &e) { - return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()) + return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()); } } diff --git a/samples/server/petstore/cpp-pistache/api/PetApi.cpp b/samples/server/petstore/cpp-pistache/api/PetApi.cpp index a05048ec790..c3b19e937b7 100644 --- a/samples/server/petstore/cpp-pistache/api/PetApi.cpp +++ b/samples/server/petstore/cpp-pistache/api/PetApi.cpp @@ -55,7 +55,7 @@ std::pair PetApi::handleParsingException(cons } catch (org::openapitools::server::helpers::ValidationException &e) { return std::make_pair(Pistache::Http::Code::Bad_Request, e.what()); } catch (std::exception &e) { - return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()) + return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()); } } diff --git a/samples/server/petstore/cpp-pistache/api/StoreApi.cpp b/samples/server/petstore/cpp-pistache/api/StoreApi.cpp index 480bdcc0334..11310ecff12 100644 --- a/samples/server/petstore/cpp-pistache/api/StoreApi.cpp +++ b/samples/server/petstore/cpp-pistache/api/StoreApi.cpp @@ -51,7 +51,7 @@ std::pair StoreApi::handleParsingException(co } catch (org::openapitools::server::helpers::ValidationException &e) { return std::make_pair(Pistache::Http::Code::Bad_Request, e.what()); } catch (std::exception &e) { - return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()) + return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()); } } diff --git a/samples/server/petstore/cpp-pistache/api/UserApi.cpp b/samples/server/petstore/cpp-pistache/api/UserApi.cpp index 7b67dd0846e..2aff5aa9dda 100644 --- a/samples/server/petstore/cpp-pistache/api/UserApi.cpp +++ b/samples/server/petstore/cpp-pistache/api/UserApi.cpp @@ -55,7 +55,7 @@ std::pair UserApi::handleParsingException(con } catch (org::openapitools::server::helpers::ValidationException &e) { return std::make_pair(Pistache::Http::Code::Bad_Request, e.what()); } catch (std::exception &e) { - return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()) + return std::make_pair(Pistache::Http::Code::Internal_Server_Error, e.what()); } } From 7d35e8dd9b152bd89b5047c65f85053553e55b60 Mon Sep 17 00:00:00 2001 From: LeComptoirDesPharmacies Date: Sat, 14 Aug 2021 18:41:14 +0200 Subject: [PATCH 60/72] [python-flask] Fix NoneType when deserialize optional date (See #5813) (#10081) * Bug #5813 : As "deserialize_date" and "deserialize_datetime" are used outside of "deserialize_model", we should check 'None' value before parsing string. * Bugfix 5813 : Update samples and docs --- .../src/main/resources/python-flask/util.mustache | 6 ++++++ samples/server/petstore/python-flask/openapi_server/util.py | 6 ++++++ 2 files changed, 12 insertions(+) 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 f2b90009a46..60ebebac8e1 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/util.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/util.mustache @@ -67,6 +67,9 @@ def deserialize_date(string): :return: date. :rtype: date """ + if string is None: + return None + try: from dateutil.parser import parse return parse(string).date() @@ -84,6 +87,9 @@ def deserialize_datetime(string): :return: datetime. :rtype: datetime """ + if string is None: + return None + try: from dateutil.parser import parse return parse(string) diff --git a/samples/server/petstore/python-flask/openapi_server/util.py b/samples/server/petstore/python-flask/openapi_server/util.py index e1185a713ec..2a63f2109ba 100644 --- a/samples/server/petstore/python-flask/openapi_server/util.py +++ b/samples/server/petstore/python-flask/openapi_server/util.py @@ -67,6 +67,9 @@ def deserialize_date(string): :return: date. :rtype: date """ + if string is None: + return None + try: from dateutil.parser import parse return parse(string).date() @@ -84,6 +87,9 @@ def deserialize_datetime(string): :return: datetime. :rtype: datetime """ + if string is None: + return None + try: from dateutil.parser import parse return parse(string) From 5fe76c2453df3f5a3a410850e20bdf8c85d75d9c Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Sun, 15 Aug 2021 07:49:32 +0200 Subject: [PATCH 61/72] [dart][dio] Nullable parameters & defaults for header/query parameters (#10147) * respect the nullable flag for all parameters (except path params where this is not allowed) * generate default values for header and query parameters that are not collections * we can not handle default values for collection with built_value atm. (not const) * we can not handle default values for form/body parameters atm. as those can be enums which we can not construct easily --- .../src/main/resources/dart/libraries/dio/api.mustache | 8 ++++---- .../dio/serialization/built_value/serialize.mustache | 2 +- .../petstore_client_lib_fake/lib/src/api/fake_api.dart | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/api.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/api.mustache index bcb912d6c26..295c6a67d7b 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/api.mustache @@ -44,10 +44,10 @@ class {{classname}} { {{/isDeprecated}} Future> {{nickname}}({ {{#allParams}}{{#isPathParam}} required {{{dataType}}} {{paramName}},{{/isPathParam}}{{#isQueryParam}} - {{#required}}required {{/required}}{{{dataType}}}{{^required}}?{{/required}} {{paramName}},{{/isQueryParam}}{{#isHeaderParam}} - {{#required}}required {{/required}}{{{dataType}}}{{^required}}?{{/required}} {{paramName}},{{/isHeaderParam}}{{#isBodyParam}} - {{#required}}required {{/required}}{{{dataType}}}{{^required}}?{{/required}} {{paramName}},{{/isBodyParam}}{{#isFormParam}} - {{#required}}required {{/required}}{{{dataType}}}{{^required}}?{{/required}} {{paramName}},{{/isFormParam}}{{/allParams}} + {{#required}}{{^isNullable}}required {{/isNullable}}{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}} {{paramName}}{{^isContainer}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isContainer}},{{/isQueryParam}}{{#isHeaderParam}} + {{#required}}{{^isNullable}}required {{/isNullable}}{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}} {{paramName}}{{^isContainer}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isContainer}},{{/isHeaderParam}}{{#isBodyParam}} + {{#required}}{{^isNullable}}required {{/isNullable}}{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}} {{paramName}},{{/isBodyParam}}{{#isFormParam}} + {{#required}}{{^isNullable}}required {{/isNullable}}{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}} {{paramName}},{{/isFormParam}}{{/allParams}} CancelToken? cancelToken, Map? headers, Map? extra, diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache index d876fe2979b..54d8e99c757 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/serialize.mustache @@ -16,7 +16,7 @@ {{/hasFormParams}} {{#bodyParam}} {{#isPrimitiveType}} - _bodyData = {{paramName}}{{#isFile}}.finalize(){{/isFile}}; + _bodyData = {{paramName}}{{#isFile}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}.finalize(){{/isFile}}; {{/isPrimitiveType}} {{^isPrimitiveType}} {{#isContainer}} diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart index ad7e1f479fe..b65692f8859 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart @@ -647,7 +647,7 @@ class FakeApi { /// Returns a [Future] /// Throws [DioError] if API call or serialization fails Future> testBodyWithBinary({ - required MultipartFile body, + MultipartFile? body, CancelToken? cancelToken, Map? headers, Map? extra, @@ -672,7 +672,7 @@ class FakeApi { dynamic _bodyData; try { - _bodyData = body.finalize(); + _bodyData = body?.finalize(); } catch(error, stackTrace) { throw DioError( @@ -1065,9 +1065,9 @@ class FakeApi { /// Throws [DioError] if API call or serialization fails Future> testEnumParameters({ BuiltList? enumHeaderStringArray, - String? enumHeaderString, + String? enumHeaderString = '-efg', BuiltList? enumQueryStringArray, - String? enumQueryString, + String? enumQueryString = '-efg', int? enumQueryInteger, double? enumQueryDouble, BuiltList? enumFormStringArray, From fce10c728479e2b9af92287629a3b28a8f8fe068 Mon Sep 17 00:00:00 2001 From: David Hutchison Date: Sun, 15 Aug 2021 09:04:57 +0100 Subject: [PATCH 62/72] fix: correctly checks the hash file when using a classpath input spec (#9840) The skipIfSpecIsUnchanged did not work when the input spec came from a classpath resource, which could lead to infinite build loops when the plugin was used in eclipse #5805 --- .../codegen/plugin/CodeGenMojo.java | 2 +- .../codegen/plugin/CodeGenMojoTest.java | 94 ++- .../src/test/resources/classpath/pom.xml | 59 ++ .../test/resources/petstore-on-classpath.yaml | 736 ++++++++++++++++++ 4 files changed, 884 insertions(+), 7 deletions(-) create mode 100644 modules/openapi-generator-maven-plugin/src/test/resources/classpath/pom.xml create mode 100644 modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml 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 8949156f4d8..1f1dbd946f5 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 @@ -458,7 +458,7 @@ public class CodeGenMojo extends AbstractMojo { } } - if (Boolean.TRUE.equals(skipIfSpecIsUnchanged) && inputSpecFile.exists()) { + if (Boolean.TRUE.equals(skipIfSpecIsUnchanged)) { File storedInputSpecHashFile = getHashFile(inputSpecFile); if (storedInputSpecHashFile.exists()) { String inputSpecHash = null; diff --git a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java index ad69be7e720..dd2083d017e 100644 --- a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java +++ b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java @@ -16,6 +16,13 @@ package org.openapitools.codegen.plugin; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Map; + import org.apache.commons.io.FileUtils; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; @@ -25,12 +32,6 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingRequest; import org.eclipse.aether.DefaultRepositorySystemSession; -import org.openapitools.codegen.plugin.stubs.StubUtility; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Map; public class CodeGenMojoTest extends BaseTestCase { @Override @@ -67,6 +68,87 @@ public class CodeGenMojoTest extends BaseTestCase { assertTrue(hashFolder.resolve("petstore.yaml-executionId.sha256").toFile().exists()); } + /** + * For a Pom file which refers to a input file which will be on the classpath, as opposed to a file path, + * test that the spec is not regenerated when the hash has not changed. + * + * @throws Exception + */ + public void testSkipRegenerationForClasspathSpecFileNoChange() throws Exception { + + //GIVEN + /* Setup the mojo */ + final Path folder = Files.createTempDirectory("test-classpath"); + final CodeGenMojo mojo = loadMojo(folder.toFile(), "src/test/resources/classpath", "executionId"); + + /* Perform an initial generation */ + mojo.execute(); + + /* Check the hash file was created */ + final Path hashFolder = folder.resolve("target/generated-sources/common-maven/remote-openapi/.openapi-generator"); + assertTrue(hashFolder.resolve("petstore-on-classpath.yaml-executionId.sha256").toFile().exists()); + + /* Remove the generated source */ + Files.walk(folder.resolve("target/generated-sources/common-maven/remote-openapi/src")) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + + + // WHEN + /* Execute the mojo again */ + mojo.execute(); + + // THEN + /* Verify that the source directory has not been repopulated. If it has then we generated code again */ + assertFalse("src directory should not have been regenerated", + folder.resolve("target/generated-sources/common-maven/remote-openapi/src").toFile().exists()); + + } + + /** + * For a Pom file which refers to a input file which will be on the classpath, as opposed to a file path, + * test that the generated source is regenerated when the hash has changed. + * + * @throws Exception + */ + public void testSkipRegenerationForClasspathSpecFileWithChange() throws Exception { + + //GIVEN + /* Setup the mojo */ + final Path folder = Files.createTempDirectory("test-classpath"); + final CodeGenMojo mojo = loadMojo(folder.toFile(), "src/test/resources/classpath", "executionId"); + + /* Perform an initial generation */ + mojo.execute(); + + /* Check the hash file was created, proving a generation occurred */ + final Path hashFolder = folder.resolve("target/generated-sources/common-maven/remote-openapi/.openapi-generator"); + assertTrue(hashFolder.resolve("petstore-on-classpath.yaml-executionId.sha256").toFile().exists()); + + /* Update the hash contents to be a different value, simulating a spec change */ + Files.write( + hashFolder.resolve("petstore-on-classpath.yaml-executionId.sha256"), + Arrays.asList("bd1bf4a953c858f9d47b67ed6029daacf1707e5cbd3d2e4b01383ba30363366f")); + + /* Remove the generated source */ + Files.walk(folder.resolve("target/generated-sources/common-maven/remote-openapi/src")) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + + + // WHEN + /* Execute the mojo again */ + mojo.execute(); + + // THEN + /* Verify that the source directory has not been repopulated. If it has then we generated code again */ + assertTrue("src directory should have been regenerated", + folder.resolve("target/generated-sources/common-maven/remote-openapi/src").toFile().exists()); + + } + protected CodeGenMojo loadMojo(File temporaryFolder, String projectRoot) throws Exception { return loadMojo(temporaryFolder, projectRoot, "default"); } diff --git a/modules/openapi-generator-maven-plugin/src/test/resources/classpath/pom.xml b/modules/openapi-generator-maven-plugin/src/test/resources/classpath/pom.xml new file mode 100644 index 00000000000..6a841479f9d --- /dev/null +++ b/modules/openapi-generator-maven-plugin/src/test/resources/classpath/pom.xml @@ -0,0 +1,59 @@ + + + + 4.0.0 + common.maven + common-maven + jar + 1.0.0-SNAPSHOT + OpenAPI Generator Configuration Test + https://openapi-generator.tech/ + + common-maven + + + org.openapitools + openapi-generator-maven-plugin + + + petstore-on-classpath.yaml + java + + true + + + joda + + jersey2 + ${basedir}/target/generated-sources/common-maven/remote-openapi + remote.org.openapitools.client.api + remote.org.openapitools.client.model + remote.org.openapitools.client + + + + executionId + generate-sources + + generate + + + + + + + \ No newline at end of file diff --git a/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml b/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml new file mode 100644 index 00000000000..f5e98eec38d --- /dev/null +++ b/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml @@ -0,0 +1,736 @@ +openapi: 3.0.0 +servers: + - url: 'http://petstore.swagger.io/v2' +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. + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: '' + operationId: addPet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + put: + tags: + - pet + summary: Update an existing pet + description: '' + operationId: updatePet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + '405': + description: Validation exception + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid status value + security: + - petstore_auth: + - 'read:pets' + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: >- + Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid tag value + security: + - petstore_auth: + - 'read:pets' + deprecated: true + '/pet/{petId}': + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: '' + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + delete: + tags: + - pet + summary: Deletes a pet + description: '' + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '400': + description: Invalid pet value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + '/pet/{petId}/uploadImage': + post: + tags: + - pet + summary: uploads an image + description: '' + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + type: string + format: binary + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: '' + operationId: placeOrder + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid Order + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + '/store/order/{orderId}': + get: + tags: + - store + summary: Find purchase order by ID + description: >- + For valid response try integer IDs with value <= 5 or > 10. Other values + will generated exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid ID supplied + '404': + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: >- + For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid ID supplied + '404': + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithArrayInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithListInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: '' + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + '200': + description: successful operation + headers: + Set-Cookie: + description: >- + Cookie authentication key for use with the `api_key` + apiKey authentication. + schema: + type: string + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when toekn expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + '400': + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: '' + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + '/user/{username}': + get: + tags: + - user + summary: Get user by user name + description: '' + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + '400': + description: Invalid username supplied + '404': + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid user supplied + '404': + description: User not found + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid username supplied + '404': + description: User not found + security: + - api_key: [] +externalDocs: + description: Find out more about Swagger + url: 'http://swagger.io' +components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header + schemas: + Order: + title: Pet Order + description: An order for a pets from the pet store + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + title: Pet category + description: A category for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + format: int32 + description: User Status + xml: + name: User + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string From 2210c9f0166471b81ae483550121c987e69a722c Mon Sep 17 00:00:00 2001 From: Arthur Mogliev Date: Sun, 15 Aug 2021 18:15:44 +0400 Subject: [PATCH 63/72] [PHP] New client generator php-dt (#10041) * - new PHP client generator php-dt * - samples regen after rebase * - README update * - fix missing options for php-dt-modern config * - use another workaround to prevent special treatment of form media types in DefaultGenerator - GlobalSettings usage mangled behaviour of other generators - fix of missing spaces in generated docs * - samples update after rebase --- .gitignore | 3 + README.md | 5 +- bin/configs/php-dt-modern.yaml | 6 + bin/configs/php-dt.yaml | 4 + docs/generators.md | 1 + docs/generators/README.md | 1 + docs/generators/php-dt.md | 242 +++ .../PhpDataTransferClientCodegen.java | 444 +++++ .../org.openapitools.codegen.CodegenConfig | 1 + .../php-dt-modern/ApiClient.php.mustache | 123 ++ .../ApiClientFactory.php.mustache | 30 + .../php-dt-modern/README.md.mustache | 135 ++ .../php-dt-modern/api_arg_call.mustache | 13 + .../api_arg_declaration.mustache | 17 + .../php-dt-modern/api_arg_doc.mustache | 23 + .../php-dt-modern/composer.json.mustache | 26 + .../main/resources/php-dt-modern/gitignore | 6 + .../php-dt-modern/list_item_type.mustache | 8 + .../php-dt-modern/map_item_type.mustache | 8 + .../resources/php-dt-modern/model.mustache | 13 + .../php-dt-modern/model_container.mustache | 57 + .../php-dt-modern/model_normal_var.mustache | 45 + .../php-dt-modern/model_object.mustache | 23 + .../php-dt-modern/model_query_var.mustache | 51 + .../resources/php-dt/ApiClient.php.mustache | 123 ++ .../php-dt/ApiClientFactory.php.mustache | 30 + .../main/resources/php-dt/README.md.mustache | 135 ++ .../resources/php-dt/api_arg_call.mustache | 13 + .../php-dt/api_arg_declaration.mustache | 17 + .../resources/php-dt/api_arg_doc.mustache | 23 + .../resources/php-dt/composer.json.mustache | 27 + .../src/main/resources/php-dt/gitignore | 6 + .../resources/php-dt/list_item_type.mustache | 8 + .../resources/php-dt/map_item_type.mustache | 8 + .../src/main/resources/php-dt/model.mustache | 13 + .../resources/php-dt/model_container.mustache | 59 + .../php-dt/model_normal_var.mustache | 45 + .../resources/php-dt/model_object.mustache | 24 + .../resources/php-dt/model_query_var.mustache | 51 + .../client/petstore/php-dt-modern/.gitignore | 6 + .../php-dt-modern/.openapi-generator-ignore | 23 + .../php-dt-modern/.openapi-generator/FILES | 62 + .../php-dt-modern/.openapi-generator/VERSION | 1 + .../client/petstore/php-dt-modern/README.md | 135 ++ .../petstore/php-dt-modern/composer.json | 26 + .../php-dt-modern/src/App/ApiClient.php | 1471 +++++++++++++++++ .../src/App/ApiClientFactory.php | 30 + .../php-dt-modern/src/App/DTO/ApiResponse.php | 25 + .../php-dt-modern/src/App/DTO/Category.php | 22 + .../php-dt-modern/src/App/DTO/Collection.php | 14 + .../php-dt-modern/src/App/DTO/Collection1.php | 14 + .../src/App/DTO/Collection10.php | 14 + .../src/App/DTO/Collection11.php | 14 + .../src/App/DTO/Collection12.php | 14 + .../src/App/DTO/Collection13.php | 14 + .../src/App/DTO/Collection14.php | 14 + .../src/App/DTO/Collection15.php | 14 + .../src/App/DTO/Collection16.php | 14 + .../src/App/DTO/Collection17.php | 14 + .../src/App/DTO/Collection18.php | 14 + .../src/App/DTO/Collection19.php | 14 + .../php-dt-modern/src/App/DTO/Collection2.php | 14 + .../src/App/DTO/Collection20.php | 14 + .../src/App/DTO/Collection21.php | 14 + .../src/App/DTO/Collection22.php | 14 + .../src/App/DTO/Collection23.php | 14 + .../src/App/DTO/Collection24.php | 14 + .../src/App/DTO/Collection25.php | 14 + .../src/App/DTO/Collection26.php | 14 + .../src/App/DTO/Collection27.php | 14 + .../src/App/DTO/Collection28.php | 14 + .../src/App/DTO/Collection29.php | 14 + .../php-dt-modern/src/App/DTO/Collection3.php | 14 + .../src/App/DTO/Collection30.php | 14 + .../src/App/DTO/Collection31.php | 14 + .../src/App/DTO/Collection32.php | 14 + .../src/App/DTO/Collection33.php | 14 + .../src/App/DTO/Collection34.php | 14 + .../src/App/DTO/Collection35.php | 14 + .../src/App/DTO/Collection36.php | 14 + .../php-dt-modern/src/App/DTO/Collection4.php | 14 + .../php-dt-modern/src/App/DTO/Collection5.php | 14 + .../php-dt-modern/src/App/DTO/Collection6.php | 14 + .../php-dt-modern/src/App/DTO/Collection7.php | 14 + .../php-dt-modern/src/App/DTO/Collection8.php | 14 + .../php-dt-modern/src/App/DTO/Collection9.php | 14 + .../src/App/DTO/DeleteOrderParameterData.php | 21 + .../src/App/DTO/DeletePetParameterData.php | 26 + .../src/App/DTO/DeleteUserParameterData.php | 21 + .../App/DTO/FindPetsByStatusParameterData.php | 21 + .../App/DTO/FindPetsByTagsParameterData.php | 21 + .../src/App/DTO/GetOrderByIdParameterData.php | 23 + .../src/App/DTO/GetPetByIdParameterData.php | 21 + .../App/DTO/GetUserByNameParameterData.php | 21 + .../src/App/DTO/InlineObject.php | 24 + .../src/App/DTO/InlineObject1.php | 25 + .../src/App/DTO/LoginUserParameterData.php | 30 + .../php-dt-modern/src/App/DTO/Order.php | 41 + .../php-dt-modern/src/App/DTO/Pet.php | 43 + .../php-dt-modern/src/App/DTO/Tag.php | 21 + .../DTO/UpdatePetWithFormParameterData.php | 21 + .../src/App/DTO/UpdateUserParameterData.php | 21 + .../src/App/DTO/UploadFileParameterData.php | 21 + .../php-dt-modern/src/App/DTO/User.php | 48 + samples/client/petstore/php-dt/.gitignore | 6 + .../petstore/php-dt/.openapi-generator-ignore | 23 + .../petstore/php-dt/.openapi-generator/FILES | 62 + .../php-dt/.openapi-generator/VERSION | 1 + samples/client/petstore/php-dt/README.md | 135 ++ samples/client/petstore/php-dt/composer.json | 27 + .../petstore/php-dt/src/App/ApiClient.php | 1471 +++++++++++++++++ .../php-dt/src/App/ApiClientFactory.php | 30 + .../php-dt/src/App/DTO/ApiResponse.php | 34 + .../petstore/php-dt/src/App/DTO/Category.php | 28 + .../php-dt/src/App/DTO/Collection.php | 16 + .../php-dt/src/App/DTO/Collection1.php | 16 + .../php-dt/src/App/DTO/Collection10.php | 16 + .../php-dt/src/App/DTO/Collection11.php | 16 + .../php-dt/src/App/DTO/Collection12.php | 16 + .../php-dt/src/App/DTO/Collection13.php | 16 + .../php-dt/src/App/DTO/Collection14.php | 16 + .../php-dt/src/App/DTO/Collection15.php | 16 + .../php-dt/src/App/DTO/Collection16.php | 16 + .../php-dt/src/App/DTO/Collection17.php | 16 + .../php-dt/src/App/DTO/Collection18.php | 16 + .../php-dt/src/App/DTO/Collection19.php | 16 + .../php-dt/src/App/DTO/Collection2.php | 16 + .../php-dt/src/App/DTO/Collection20.php | 16 + .../php-dt/src/App/DTO/Collection21.php | 16 + .../php-dt/src/App/DTO/Collection22.php | 16 + .../php-dt/src/App/DTO/Collection23.php | 16 + .../php-dt/src/App/DTO/Collection24.php | 16 + .../php-dt/src/App/DTO/Collection25.php | 16 + .../php-dt/src/App/DTO/Collection26.php | 16 + .../php-dt/src/App/DTO/Collection27.php | 16 + .../php-dt/src/App/DTO/Collection28.php | 16 + .../php-dt/src/App/DTO/Collection29.php | 16 + .../php-dt/src/App/DTO/Collection3.php | 16 + .../php-dt/src/App/DTO/Collection30.php | 16 + .../php-dt/src/App/DTO/Collection31.php | 16 + .../php-dt/src/App/DTO/Collection32.php | 16 + .../php-dt/src/App/DTO/Collection33.php | 16 + .../php-dt/src/App/DTO/Collection34.php | 16 + .../php-dt/src/App/DTO/Collection35.php | 16 + .../php-dt/src/App/DTO/Collection36.php | 16 + .../php-dt/src/App/DTO/Collection4.php | 16 + .../php-dt/src/App/DTO/Collection5.php | 16 + .../php-dt/src/App/DTO/Collection6.php | 16 + .../php-dt/src/App/DTO/Collection7.php | 16 + .../php-dt/src/App/DTO/Collection8.php | 16 + .../php-dt/src/App/DTO/Collection9.php | 16 + .../src/App/DTO/DeleteOrderParameterData.php | 22 + .../src/App/DTO/DeletePetParameterData.php | 30 + .../src/App/DTO/DeleteUserParameterData.php | 22 + .../App/DTO/FindPetsByStatusParameterData.php | 22 + .../App/DTO/FindPetsByTagsParameterData.php | 22 + .../src/App/DTO/GetOrderByIdParameterData.php | 24 + .../src/App/DTO/GetPetByIdParameterData.php | 22 + .../App/DTO/GetUserByNameParameterData.php | 22 + .../php-dt/src/App/DTO/InlineObject.php | 28 + .../php-dt/src/App/DTO/InlineObject1.php | 29 + .../src/App/DTO/LoginUserParameterData.php | 32 + .../petstore/php-dt/src/App/DTO/Order.php | 57 + .../petstore/php-dt/src/App/DTO/Pet.php | 59 + .../petstore/php-dt/src/App/DTO/Tag.php | 27 + .../DTO/UpdatePetWithFormParameterData.php | 22 + .../src/App/DTO/UpdateUserParameterData.php | 22 + .../src/App/DTO/UploadFileParameterData.php | 22 + .../petstore/php-dt/src/App/DTO/User.php | 70 + website/i18n/en.json | 4 + 170 files changed, 7621 insertions(+), 2 deletions(-) create mode 100644 bin/configs/php-dt-modern.yaml create mode 100644 bin/configs/php-dt.yaml create mode 100644 docs/generators/php-dt.md create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/ApiClient.php.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/ApiClientFactory.php.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/README.md.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_call.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_declaration.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/composer.json.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/gitignore create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/list_item_type.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/map_item_type.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/model.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/model_container.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/model_normal_var.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/model_object.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt-modern/model_query_var.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/ApiClient.php.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/ApiClientFactory.php.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/README.md.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/api_arg_call.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/api_arg_declaration.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/api_arg_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/composer.json.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/gitignore create mode 100644 modules/openapi-generator/src/main/resources/php-dt/list_item_type.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/map_item_type.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/model.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/model_container.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/model_normal_var.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/model_object.mustache create mode 100644 modules/openapi-generator/src/main/resources/php-dt/model_query_var.mustache create mode 100644 samples/client/petstore/php-dt-modern/.gitignore create mode 100644 samples/client/petstore/php-dt-modern/.openapi-generator-ignore create mode 100644 samples/client/petstore/php-dt-modern/.openapi-generator/FILES create mode 100644 samples/client/petstore/php-dt-modern/.openapi-generator/VERSION create mode 100644 samples/client/petstore/php-dt-modern/README.md create mode 100644 samples/client/petstore/php-dt-modern/composer.json create mode 100644 samples/client/petstore/php-dt-modern/src/App/ApiClient.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/ApiClientFactory.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/ApiResponse.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Category.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection1.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection10.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection11.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection12.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection13.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection14.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection15.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection16.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection17.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection18.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection19.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection2.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection20.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection21.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection22.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection23.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection24.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection25.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection26.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection27.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection28.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection29.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection3.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection30.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection31.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection32.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection33.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection34.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection35.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection36.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection4.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection5.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection6.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection7.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection8.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Collection9.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/DeleteOrderParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/DeletePetParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/DeleteUserParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByStatusParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByTagsParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/GetOrderByIdParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/GetPetByIdParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/GetUserByNameParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject1.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/LoginUserParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Order.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Pet.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/Tag.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/UpdatePetWithFormParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/UpdateUserParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/UploadFileParameterData.php create mode 100644 samples/client/petstore/php-dt-modern/src/App/DTO/User.php create mode 100644 samples/client/petstore/php-dt/.gitignore create mode 100644 samples/client/petstore/php-dt/.openapi-generator-ignore create mode 100644 samples/client/petstore/php-dt/.openapi-generator/FILES create mode 100644 samples/client/petstore/php-dt/.openapi-generator/VERSION create mode 100644 samples/client/petstore/php-dt/README.md create mode 100644 samples/client/petstore/php-dt/composer.json create mode 100644 samples/client/petstore/php-dt/src/App/ApiClient.php create mode 100644 samples/client/petstore/php-dt/src/App/ApiClientFactory.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/ApiResponse.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Category.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection1.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection10.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection11.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection12.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection13.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection14.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection15.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection16.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection17.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection18.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection19.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection2.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection20.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection21.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection22.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection23.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection24.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection25.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection26.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection27.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection28.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection29.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection3.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection30.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection31.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection32.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection33.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection34.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection35.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection36.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection4.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection5.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection6.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection7.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection8.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Collection9.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/DeleteOrderParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/DeletePetParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/DeleteUserParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/FindPetsByStatusParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/FindPetsByTagsParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/GetOrderByIdParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/GetPetByIdParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/GetUserByNameParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/InlineObject.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/InlineObject1.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/LoginUserParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Order.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Pet.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/Tag.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/UpdatePetWithFormParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/UpdateUserParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/UploadFileParameterData.php create mode 100644 samples/client/petstore/php-dt/src/App/DTO/User.php diff --git a/.gitignore b/.gitignore index 9ce6c04e156..e72b71f24d1 100644 --- a/.gitignore +++ b/.gitignore @@ -176,12 +176,15 @@ samples/client/petstore/python-tornado/.venv/ # PHP samples/client/petstore/php/OpenAPIClient-php/composer.lock +samples/client/petstore/php-dt/composer.lock +samples/client/petstore/php-dt-modern/composer.lock samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock samples/server/petstore/php-laravel/lib/composer.lock samples/server/petstore/php-lumen/lib/composer.lock samples/server/petstore/php-slim4/composer.lock samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock samples/server/petstore/php-mezzio-ph/composer.lock +samples/server/petstore/php-mezzio-ph-modern/composer.lock # ts samples/client/petstore/typescript-angular2/npm/npm-debug.log diff --git a/README.md b/README.md index d4e2056ddde..7ac8f579fe3 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se | | Languages/Frameworks | | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0, .NET 5.0. Libraries: RestSharp, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) | -| **Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) | +| **Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) | | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML** | | **Configuration files** | [**Apache2**](https://httpd.apache.org/) | | **Others** | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL** | @@ -905,6 +905,7 @@ Here is a list of template creators: * OCaml: @cgensoul * Perl: @wing328 [:heart:](https://www.patreon.com/wing328) * PHP (Guzzle): @baartosz + * PHP (with Data Transfer): @Articus * PowerShell: @beatcracker * PowerShell (refactored in 5.0.0): @wing328 * Python: @spacether @@ -963,10 +964,10 @@ Here is a list of template creators: * NodeJS Express: @YishTish * PHP Laravel: @renepardon * PHP Lumen: @abcsun + * PHP Mezzio (with Path Handler): @Articus * PHP Slim: @jfastnacht * PHP Slim4: @ybelenko * PHP Symfony: @ksm2 - * PHP Zend Expressive (with Path Handler): @Articus * Python FastAPI: @krjakbrjak * Python AIOHTTP: @Jyhess * Ruby on Rails 5: @zlx diff --git a/bin/configs/php-dt-modern.yaml b/bin/configs/php-dt-modern.yaml new file mode 100644 index 00000000000..33432079423 --- /dev/null +++ b/bin/configs/php-dt-modern.yaml @@ -0,0 +1,6 @@ +generatorName: php-dt +outputDir: samples/client/petstore/php-dt-modern +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/php-dt-modern +additionalProperties: + modern: "true" diff --git a/bin/configs/php-dt.yaml b/bin/configs/php-dt.yaml new file mode 100644 index 00000000000..6e1cbcccc57 --- /dev/null +++ b/bin/configs/php-dt.yaml @@ -0,0 +1,4 @@ +generatorName: php-dt +outputDir: samples/client/petstore/php-dt +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/php-dt diff --git a/docs/generators.md b/docs/generators.md index c71da0663ed..ae2927f6dce 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -50,6 +50,7 @@ The following generators are available: * [ocaml](generators/ocaml.md) * [perl](generators/perl.md) * [php](generators/php.md) +* [php-dt](generators/php-dt.md) * [powershell (beta)](generators/powershell.md) * [python (experimental)](generators/python.md) * [python-legacy](generators/python-legacy.md) diff --git a/docs/generators/README.md b/docs/generators/README.md index a8ac9c9310c..b9e8926f664 100644 --- a/docs/generators/README.md +++ b/docs/generators/README.md @@ -39,6 +39,7 @@ The following generators are available: * [ocaml](ocaml.md) * [perl](perl.md) * [php](php.md) +* [php-dt](php-dt.md) * [powershell](powershell.md) * [python](python.md) * [python-legacy](python-legacy.md) diff --git a/docs/generators/php-dt.md b/docs/generators/php-dt.md new file mode 100644 index 00000000000..0ce4ccd3deb --- /dev/null +++ b/docs/generators/php-dt.md @@ -0,0 +1,242 @@ +--- +title: Config Options for php-dt +sidebar_label: php-dt +--- + +These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details. + +| Option | Description | Values | Default | +| ------ | ----------- | ------ | ------- | +|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|apiPackage|package for generated api classes| |null| +|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null| +|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
                        **false**
                        The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
                        **true**
                        Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
                        |true| +|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| +|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
                        **true**
                        The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
                        **false**
                        The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
                        |true| +|modelPackage|package for generated models| |null| +|modern|use modern language features (generated code will require PHP 8.0)| |false| +|packageName|The main package name for classes. e.g. GeneratedPetstore| |null| +|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| +|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| +|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|srcBasePath|The directory to serve as source root.| |null| +|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case| + +## IMPORT MAPPING + +| Type/Alias | Imports | +| ---------- | ------- | + + +## INSTANTIATION TYPES + +| Type/Alias | Instantiated By | +| ---------- | --------------- | +|array|array| +|map|array| + + +## LANGUAGE PRIMITIVES + +
                          +
                        • DateTime
                          • +
                        • bool
                          • +
                        • boolean
                          • +
                        • byte
                          • +
                        • double
                          • +
                        • float
                          • +
                        • int
                          • +
                        • integer
                          • +
                        • mixed
                          • +
                        • number
                          • +
                        • object
                          • +
                        • string
                          • +
                        • void
                          • +
                        + +## RESERVED WORDS + +
                          +
                        • __halt_compiler
                          • +
                        • _header_accept
                          • +
                        • _tempbody
                          • +
                        • abstract
                          • +
                        • and
                          • +
                        • array
                          • +
                        • as
                          • +
                        • break
                          • +
                        • callable
                          • +
                        • case
                          • +
                        • catch
                          • +
                        • class
                          • +
                        • clone
                          • +
                        • const
                          • +
                        • continue
                          • +
                        • declare
                          • +
                        • default
                          • +
                        • die
                          • +
                        • do
                          • +
                        • echo
                          • +
                        • else
                          • +
                        • elseif
                          • +
                        • empty
                          • +
                        • enddeclare
                          • +
                        • endfor
                          • +
                        • endforeach
                          • +
                        • endif
                          • +
                        • endswitch
                          • +
                        • endwhile
                          • +
                        • eval
                          • +
                        • exit
                          • +
                        • extends
                          • +
                        • final
                          • +
                        • for
                          • +
                        • foreach
                          • +
                        • formparams
                          • +
                        • function
                          • +
                        • global
                          • +
                        • goto
                          • +
                        • headerparams
                          • +
                        • httpbody
                          • +
                        • if
                          • +
                        • implements
                          • +
                        • include
                          • +
                        • include_once
                          • +
                        • instanceof
                          • +
                        • insteadof
                          • +
                        • interface
                          • +
                        • isset
                          • +
                        • list
                          • +
                        • namespace
                          • +
                        • new
                          • +
                        • or
                          • +
                        • print
                          • +
                        • private
                          • +
                        • protected
                          • +
                        • public
                          • +
                        • queryparams
                          • +
                        • require
                          • +
                        • require_once
                          • +
                        • resourcepath
                          • +
                        • return
                          • +
                        • static
                          • +
                        • switch
                          • +
                        • throw
                          • +
                        • trait
                          • +
                        • try
                          • +
                        • unset
                          • +
                        • use
                          • +
                        • var
                          • +
                        • while
                          • +
                        • xor
                          • +
                        + +## FEATURE SET + + +### Client Modification Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasePath|✗|ToolingExtension +|Authorizations|✗|ToolingExtension +|UserAgent|✗|ToolingExtension +|MockServer|✗|ToolingExtension + +### Data Type Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Custom|✗|OAS2,OAS3 +|Int32|✓|OAS2,OAS3 +|Int64|✓|OAS2,OAS3 +|Float|✓|OAS2,OAS3 +|Double|✓|OAS2,OAS3 +|Decimal|✓|ToolingExtension +|String|✓|OAS2,OAS3 +|Byte|✓|OAS2,OAS3 +|Binary|✓|OAS2,OAS3 +|Boolean|✓|OAS2,OAS3 +|Date|✓|OAS2,OAS3 +|DateTime|✓|OAS2,OAS3 +|Password|✓|OAS2,OAS3 +|File|✓|OAS2 +|Array|✓|OAS2,OAS3 +|Maps|✓|ToolingExtension +|CollectionFormat|✓|OAS2 +|CollectionFormatMulti|✓|OAS2 +|Enum|✓|OAS2,OAS3 +|ArrayOfEnum|✓|ToolingExtension +|ArrayOfModel|✓|ToolingExtension +|ArrayOfCollectionOfPrimitives|✓|ToolingExtension +|ArrayOfCollectionOfModel|✓|ToolingExtension +|ArrayOfCollectionOfEnum|✓|ToolingExtension +|MapOfEnum|✓|ToolingExtension +|MapOfModel|✓|ToolingExtension +|MapOfCollectionOfPrimitives|✓|ToolingExtension +|MapOfCollectionOfModel|✓|ToolingExtension +|MapOfCollectionOfEnum|✓|ToolingExtension + +### Documentation Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Readme|✓|ToolingExtension +|Model|✓|ToolingExtension +|Api|✓|ToolingExtension + +### Global Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Host|✓|OAS2,OAS3 +|BasePath|✓|OAS2,OAS3 +|Info|✓|OAS2,OAS3 +|Schemes|✗|OAS2,OAS3 +|PartialSchemes|✓|OAS2,OAS3 +|Consumes|✓|OAS2 +|Produces|✓|OAS2 +|ExternalDocumentation|✓|OAS2,OAS3 +|Examples|✓|OAS2,OAS3 +|XMLStructureDefinitions|✗|OAS2,OAS3 +|MultiServer|✗|OAS3 +|ParameterizedServer|✗|OAS3 +|ParameterStyling|✗|OAS3 +|Callbacks|✗|OAS3 +|LinkObjects|✗|OAS3 + +### Parameter Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Path|✓|OAS2,OAS3 +|Query|✓|OAS2,OAS3 +|Header|✓|OAS2,OAS3 +|Body|✓|OAS2 +|FormUnencoded|✓|OAS2 +|FormMultipart|✓|OAS2 +|Cookie|✓|OAS3 + +### Schema Support Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Simple|✓|OAS2,OAS3 +|Composite|✓|OAS2,OAS3 +|Polymorphism|✗|OAS2,OAS3 +|Union|✗|OAS3 + +### Security Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasicAuth|✗|OAS2,OAS3 +|ApiKey|✗|OAS2,OAS3 +|OpenIDConnect|✗|OAS3 +|BearerToken|✗|OAS3 +|OAuth2_Implicit|✗|OAS2,OAS3 +|OAuth2_Password|✗|OAS2,OAS3 +|OAuth2_ClientCredentials|✗|OAS2,OAS3 +|OAuth2_AuthorizationCode|✗|OAS2,OAS3 + +### Wire Format Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|JSON|✓|OAS2,OAS3 +|XML|✗|OAS2,OAS3 +|PROTOBUF|✗|ToolingExtension +|Custom|✗|OAS2,OAS3 diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java new file mode 100644 index 00000000000..e85f3b67da4 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java @@ -0,0 +1,444 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * Copyright 2018 SmartBear Software + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.languages; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.PathItem.HttpMethod; +import io.swagger.v3.oas.models.Paths; +import io.swagger.v3.oas.models.media.*; +import io.swagger.v3.oas.models.parameters.Parameter; +import io.swagger.v3.oas.models.parameters.RequestBody; +import io.swagger.v3.oas.models.responses.ApiResponse; +import io.swagger.v3.oas.models.responses.ApiResponses; +import org.openapitools.codegen.*; +import org.openapitools.codegen.meta.features.*; +import org.openapitools.codegen.utils.ModelUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.*; + +public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { + private final Logger LOGGER = LoggerFactory.getLogger(PhpDataTransferClientCodegen.class); + // Custom generator option names + public static final String OPT_MODERN = "modern"; + // Internal vendor extension names for extra template data that should not be set in specification + public static final String VEN_PARAMETER_LOCATION = "internal.parameterLocation"; + public static final String VEN_FROM_PARAMETERS = "internal.fromParameters"; + public static final String VEN_COLLECTION_FORMAT = "internal.collectionFormat"; + public static final String VEN_PARAMETER_DATA_TYPE = "internal.parameterDataType"; + public static final String VEN_HAS_PARAMETER_DATA = "internal.hasParameterData"; + public static final String VEN_FROM_CONTAINER = "internal.fromContainer"; + public static final String VEN_CONTAINER_DATA_TYPE = "internal.containerDataType"; + + private boolean useModernSyntax = false; + + @Override + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + @Override + public String getName() { + return "php-dt"; + } + + @Override + public String getHelp() { + return "Generates PHP client relying on Data Transfer ( https://github.com/Articus/DataTransfer ) and compliant with PSR-7, PSR-11, PSR-17 and PSR-18."; + } + + public PhpDataTransferClientCodegen() { + super(); + modifyFeatureSet(features -> features + .includeDocumentationFeatures(DocumentationFeature.Readme) + .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON)) + .securityFeatures(EnumSet.noneOf(SecurityFeature.class)) + .excludeGlobalFeatures( + GlobalFeature.XMLStructureDefinitions, + GlobalFeature.Callbacks, + GlobalFeature.LinkObjects, + GlobalFeature.ParameterStyling + ) + .excludeSchemaSupportFeatures( + SchemaSupportFeature.Polymorphism + ) + ); + + //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"); + + apiTemplateFiles.clear(); + apiTestTemplateFiles.clear(); + apiDocTemplateFiles.clear(); + modelTestTemplateFiles.clear(); + modelDocTemplateFiles.clear(); + + additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, "1.0.0"); + //Register custom CLI options + addSwitch(OPT_MODERN, "use modern language features (generated code will require PHP 8.0)", useModernSyntax); + } + + @Override + public void processOpts() { + setSrcBasePath("src"); + //Preserve and process options mangled in parent class + String rootNamespace = "App"; + if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { + rootNamespace = (String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE); + } + String modelNamespace = rootNamespace + "\\DTO"; + if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { + modelNamespace = (String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE); + } + super.processOpts(); + //Restore mangled options + setInvokerPackage(rootNamespace); + additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, rootNamespace); + setModelPackage(modelNamespace); + additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelNamespace); + //Process custom options + if (additionalProperties.containsKey(OPT_MODERN)) { + embeddedTemplateDir = templateDir = "php-dt-modern"; + useModernSyntax = true; + } else { + embeddedTemplateDir = templateDir = "php-dt"; + } + + supportingFiles.add(new SupportingFile("composer.json.mustache", "", "composer.json")); + supportingFiles.add(new SupportingFile("ApiClient.php.mustache", toSrcPath(invokerPackage, srcBasePath), "ApiClient.php")); + supportingFiles.add(new SupportingFile("ApiClientFactory.php.mustache", toSrcPath(invokerPackage, srcBasePath), "ApiClientFactory.php")); + supportingFiles.add(new SupportingFile("README.md.mustache", "", "README.md")); + } + + @Override + public String toSrcPath(String packageName, String basePath) { + return basePath + File.separator + packageName.replace("\\", File.separator); + } + + @Override + public String toApiName(String name) { + return super.toApiName(toModelName(name)); + } + + @Override + public String getTypeDeclaration(Schema p) { + String result; + Map extensions = p.getExtensions(); + if ((extensions != null) && extensions.containsKey(VEN_CONTAINER_DATA_TYPE)) { + result = (String) extensions.get(VEN_CONTAINER_DATA_TYPE); + } else if (useModernSyntax && (ModelUtils.isArraySchema(p) || ModelUtils.isMapSchema(p))) { + result = "array"; + } else { + result = super.getTypeDeclaration(p); + } + return result; + } + + @Override + public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { + //Do not use tags for operation grouping + super.addOperationToGroup("", resourcePath, operation, co, operations); + } + + @Override + protected String getContentType(RequestBody requestBody) { + //Awfully nasty workaround to skip formParams generation + return null; + } + + @Override + public void preprocessOpenAPI(OpenAPI openAPI) { + super.preprocessOpenAPI(openAPI); + + generateParameterSchemas(openAPI); + generateContainerSchemas(openAPI); + } + + @Override + public void processOpenAPI(OpenAPI openAPI) { + super.processOpenAPI(openAPI); + + quoteMediaTypes(openAPI); + } + + /** + * Generate additional model definitions from query parameters + * + * @param openAPI OpenAPI object + */ + protected void generateParameterSchemas(OpenAPI openAPI) { + Map paths = openAPI.getPaths(); + if (paths != null) { + for (String pathname : paths.keySet()) { + PathItem path = paths.get(pathname); + Map operationMap = path.readOperationsMap(); + if (operationMap != null) { + for (HttpMethod method : operationMap.keySet()) { + Operation operation = operationMap.get(method); + Map propertySchemas = new HashMap<>(); + if (operation == null || operation.getParameters() == null) { + continue; + } + + List requiredProperties = new ArrayList<>(); + for (Parameter parameter : operation.getParameters()) { + Parameter referencedParameter = ModelUtils.getReferencedParameter(openAPI, parameter); + Schema propertySchema = convertParameterToSchema(openAPI, referencedParameter); + if (propertySchema != null) { + propertySchemas.put(propertySchema.getName(), propertySchema); + if (Boolean.TRUE.equals(referencedParameter.getRequired())) { + requiredProperties.add(propertySchema.getName()); + } + } + } + + if (!propertySchemas.isEmpty()) { + ObjectSchema schema = new ObjectSchema(); + String operationId = getOrGenerateOperationId(operation, pathname, method.name()); + schema.setDescription("Parameters for " + operationId); + schema.setProperties(propertySchemas); + schema.setRequired(requiredProperties); + addInternalExtensionToSchema(schema, VEN_FROM_PARAMETERS, Boolean.TRUE); + String schemaName = generateUniqueSchemaName(openAPI, operationId + "ParameterData"); + openAPI.getComponents().addSchemas(schemaName, schema); + String schemaDataType = getTypeDeclaration(toModelName(schemaName)); + addInternalExtensionToOperation(operation, VEN_PARAMETER_DATA_TYPE, schemaDataType); + addInternalExtensionToOperation(operation, VEN_HAS_PARAMETER_DATA, Boolean.TRUE); + } + } + } + } + } + } + + protected Schema convertParameterToSchema(OpenAPI openAPI, Parameter parameter) { + Schema property = null; + + Schema parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameter.getSchema()); + // array + if (ModelUtils.isArraySchema(parameterSchema)) { + Schema itemSchema = ((ArraySchema) parameterSchema).getItems(); + ArraySchema arraySchema = new ArraySchema(); + arraySchema.setMinItems(parameterSchema.getMinItems()); + arraySchema.setMaxItems(parameterSchema.getMaxItems()); + arraySchema.setItems(itemSchema); + String collectionFormat = getCollectionFormat(parameter); + if (collectionFormat == null) { + collectionFormat = "csv"; + } + addInternalExtensionToSchema(arraySchema, VEN_COLLECTION_FORMAT, collectionFormat); + property = arraySchema; + } else { // non-array e.g. string, integer + switch (parameterSchema.getType()) { + case "string": + StringSchema stringSchema = new StringSchema(); + stringSchema.setMinLength(parameterSchema.getMinLength()); + stringSchema.setMaxLength(parameterSchema.getMaxLength()); + stringSchema.setPattern(parameterSchema.getPattern()); + stringSchema.setEnum(parameterSchema.getEnum()); + property = stringSchema; + break; + case "integer": + IntegerSchema integerSchema = new IntegerSchema(); + integerSchema.setMinimum(parameterSchema.getMinimum()); + integerSchema.setMaximum(parameterSchema.getMaximum()); + property = integerSchema; + break; + case "number": + NumberSchema floatSchema = new NumberSchema(); + floatSchema.setMinimum(parameterSchema.getMinimum()); + floatSchema.setMaximum(parameterSchema.getMaximum()); + property = floatSchema; + break; + case "boolean": + property = new BooleanSchema(); + break; + case "date": + property = new DateSchema(); + break; + case "date-time": + property = new DateTimeSchema(); + break; + } + } + + if (property != null) { + property.setName(parameter.getName()); + property.setDescription(parameter.getDescription()); + addInternalExtensionToSchema(property, VEN_PARAMETER_LOCATION, parameter.getIn()); + } + return property; + } + + protected void addInternalExtensionToSchema(Schema schema, String name, Object value) { + //Add internal extension directly, because addExtension filters extension names + if (schema.getExtensions() == null) { + schema.setExtensions(new HashMap<>()); + } + schema.getExtensions().put(name, value); + } + + protected void addInternalExtensionToOperation(Operation operation, String name, Object value) { + //Add internal extension directly, because addExtension filters extension names + if (operation.getExtensions() == null) { + operation.setExtensions(new HashMap<>()); + } + operation.getExtensions().put(name, value); + } + + protected String generateUniqueSchemaName(OpenAPI openAPI, String name) { + String result = name; + if (openAPI.getComponents().getSchemas() != null) { + int count = 1; + while (openAPI.getComponents().getSchemas().containsKey(result)) { + result = name + "_" + count; + count += 1; + } + } + return result; + } + + /** + * Generate additional model definitions for containers in whole specification + * + * @param openAPI OpenAPI object + */ + protected void generateContainerSchemas(OpenAPI openAPI) { + Paths paths = openAPI.getPaths(); + for (String pathName : paths.keySet()) { + for (Operation operation : paths.get(pathName).readOperations()) { + List parameters = operation.getParameters(); + if (parameters != null) { + for (Parameter parameter : parameters) { + generateContainerSchemas(openAPI, ModelUtils.getReferencedParameter(openAPI, parameter).getSchema()); + } + } + RequestBody requestBody = ModelUtils.getReferencedRequestBody(openAPI, operation.getRequestBody()); + if (requestBody != null) { + Content requestBodyContent = requestBody.getContent(); + if (requestBodyContent != null) { + for (String mediaTypeName : requestBodyContent.keySet()) { + generateContainerSchemas(openAPI, requestBodyContent.get(mediaTypeName).getSchema()); + } + } + } + ApiResponses responses = operation.getResponses(); + for (String responseCode : responses.keySet()) { + ApiResponse response = ModelUtils.getReferencedApiResponse(openAPI, responses.get(responseCode)); + Content responseContent = response.getContent(); + if (responseContent != null) { + for (String mediaTypeName : responseContent.keySet()) { + generateContainerSchemas(openAPI, responseContent.get(mediaTypeName).getSchema()); + } + } + } + } + } + } + + /** + * Generate additional model definitions for containers in specified schema + * + * @param openAPI OpenAPI object + * @param schema OAS schema to process + */ + protected void generateContainerSchemas(OpenAPI openAPI, Schema schema) { + if (schema != null) { + //Dereference schema + schema = ModelUtils.getReferencedSchema(openAPI, schema); + Boolean isContainer = Boolean.FALSE; + + if (ModelUtils.isObjectSchema(schema)) { + //Recursively process all schemas of object properties + Map properties = schema.getProperties(); + if (properties != null) { + for (String propertyName: properties.keySet()) { + generateContainerSchemas(openAPI, properties.get(propertyName)); + } + } + } else if (ModelUtils.isArraySchema(schema)) { + //Recursively process schema of array items + generateContainerSchemas(openAPI, ((ArraySchema) schema).getItems()); + isContainer = Boolean.TRUE; + } else if (ModelUtils.isMapSchema(schema)) { + //Recursively process schema of map items + Object itemSchema = schema.getAdditionalProperties(); + if (itemSchema instanceof Schema) { + generateContainerSchemas(openAPI, (Schema) itemSchema); + } + isContainer = Boolean.TRUE; + } + + if (isContainer) { + //Generate special component schema for container + String containerSchemaName = generateUniqueSchemaName(openAPI, "Collection"); + Schema containerSchema = new ObjectSchema(); + containerSchema.addProperties("inner", schema); + addInternalExtensionToSchema(containerSchema, VEN_FROM_CONTAINER, Boolean.TRUE); + openAPI.getComponents().addSchemas(containerSchemaName, containerSchema); + String containerDataType = getTypeDeclaration(toModelName(containerSchemaName)); + addInternalExtensionToSchema(schema, VEN_CONTAINER_DATA_TYPE, containerDataType); + } + } + } + + /** + * Awfully nasty workaround - add quotation marks for all media types to prevent special treatment of form media types + * in org/openapitools/codegen/DefaultGenerator.java:873 + * TODO find a better way to prevent special form media type treatment + * + * @param openAPI OpenAPI object + */ + protected void quoteMediaTypes(OpenAPI openAPI) { + Map paths = openAPI.getPaths(); + if (paths != null) { + for (String pathname : paths.keySet()) { + PathItem path = paths.get(pathname); + List operations = path.readOperations(); + if (operations != null) { + for (Operation operation: operations) { + RequestBody requestBody = ModelUtils.getReferencedRequestBody(openAPI, operation.getRequestBody()); + if (requestBody != null) { + requestBody.setContent(copyWithQuotedMediaTypes(requestBody.getContent())); + } + ApiResponses responses = operation.getResponses(); + for (String responseCode : responses.keySet()) { + ApiResponse response = ModelUtils.getReferencedApiResponse(openAPI, responses.get(responseCode)); + response.setContent(copyWithQuotedMediaTypes(response.getContent())); + } + } + } + } + } + } + + protected Content copyWithQuotedMediaTypes(Content content) { + Content result = null; + if (content != null) { + result = new Content(); + for (String mediaType: content.keySet()) { + result.addMediaType("'" + mediaType + "'", content.get(mediaType)); + } + } + return result; + } +} 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 a213327b3f7..edff28e636a 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 @@ -93,6 +93,7 @@ org.openapitools.codegen.languages.PhpSlim4ServerCodegen org.openapitools.codegen.languages.PhpSilexServerCodegen org.openapitools.codegen.languages.PhpSymfonyServerCodegen org.openapitools.codegen.languages.PhpMezzioPathHandlerServerCodegen +org.openapitools.codegen.languages.PhpDataTransferClientCodegen org.openapitools.codegen.languages.PowerShellClientCodegen org.openapitools.codegen.languages.ProtobufSchemaCodegen org.openapitools.codegen.languages.PythonLegacyClientCodegen diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClient.php.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClient.php.mustache new file mode 100644 index 00000000000..60e0d184954 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClient.php.mustache @@ -0,0 +1,123 @@ +api_arg_doc +}} * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function {{operationId}}Raw( +{{>api_arg_declaration +}} ): ResponseInterface + { + $request = $this->createRequest('{{httpMethod}}', '{{path}}', {{#pathParams.0}}$this->getPathParameters($parameters){{/pathParams.0}}{{^pathParams.0}}[]{{/pathParams.0}}, {{#queryParams.0}}$this->getQueryParameters($parameters){{/queryParams.0}}{{^queryParams.0}}[]{{/queryParams.0}}); +{{#headerParams.0}} + $request = $this->addCustomHeaders($request, $parameters); +{{/headerParams.0}} +{{#cookieParams.0}} + $request = $this->addCookies($request, $parameters); +{{/cookieParams.0}} +{{#bodyParam}} + $request = $this->addBody($request, $requestMediaType, $requestContent); +{{/bodyParam}} +{{#hasProduces}} + $request = $this->addAcceptHeader($request, $responseMediaType); +{{/hasProduces}} +{{#hasAuthMethods}} + $request = $this->addSecurity($request, $security); +{{/hasAuthMethods}} + return $this->httpClient->sendRequest($request); + } + + /** +{{>api_arg_doc +}} * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function {{operationId}}( +{{>api_arg_declaration +}} ): array + { + $response = $this->{{operationId}}Raw({{>api_arg_call}}); + $responseContent = null; + switch ($response->getStatusCode()) + { +{{#responses}} + {{#isDefault}}default{{/isDefault}}{{^isDefault}}case {{code}}{{/isDefault}}: +{{#message}} + /* {{&message}} */ +{{/message}} +{{#isModel}} + $responseContent = new {{dataType}}(); +{{/isModel}} +{{^isModel}} +{{#isArray}} + $responseContent = new {{dataType}}(); +{{/isArray}} +{{/isModel}} +{{^isModel}} +{{^isArray}} +{{#isMap}} + $responseContent = new {{dataType}}(); +{{/isMap}} +{{/isArray}} +{{/isModel}} + break; +{{/responses}} + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** +{{>api_arg_doc +}} * @return {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}mixed{{/returnType}} + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function {{operationId}}Result( +{{>api_arg_declaration +}} ): {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}mixed{{/returnType}} + { + return $this->getSuccessfulContent(...$this->{{operationId}}({{>api_arg_call}})); + } + //endregion +{{^-last}} + +{{/-last}} +{{/operation}} +} + +{{/operations}} +{{/apis}} +{{/apiInfo}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClientFactory.php.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClientFactory.php.mustache new file mode 100644 index 00000000000..a36880d3d84 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/ApiClientFactory.php.mustache @@ -0,0 +1,30 @@ +getServiceConfig($container), $options ?? [])); + return new ApiClient( + $config->serverUrl, + $container->get($config->dataTransferServiceName), + $container->get($config->requestFactoryServiceName), + $container->get($config->httpClientServiceName), + $container->get($config->securityProviderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName) + ); + } +} diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/README.md.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/README.md.mustache new file mode 100644 index 00000000000..dcb54a4c78f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/README.md.mustache @@ -0,0 +1,135 @@ +# Client library for {{appName}} + +Generated by the [OpenAPI Generator](https://openapi-generator.tech) project. + +## Overview +This lightweight extensible client library is [PSR-7](https://www.php-fig.org/psr/psr-7), [PSR-11](https://www.php-fig.org/psr/psr-11), [PSR-17](https://www.php-fig.org/psr/psr-17) and [PSR-18](https://www.php-fig.org/psr/psr-18) complaint and relies on: + +- PHP: >=8.0 +- [Data Transfer](https://github.com/Articus/DataTransfer): >=0.5 + + +## How to use + +This library can be used either as a separate package (just deploy generated files to your package repository and add dependency `"{{#lambda.lowercase}}{{gitUserId}}/{{gitRepoId}}{{/lambda.lowercase}}":"{{artifactVersion}}"` to your project `composer.json`) or as a part of your project (just copy generated code from `{{srcBasePath}}` and merge generated `composer.json` into your project `composer.json`). + +First you need an implementation for [PSR-7](https://packagist.org/packages/psr/http-message) and [PSR-17](https://packagist.org/packages/psr/http-factory) interfaces. Usually it is a single package, and your project might already have one among its dependencies (for example if it is some web service). Otherwise, https://packagist.org/providers/psr/http-message-implementation and https://packagist.org/providers/psr/http-factory-implementation may help to find some suitable options. + +Next choose an implementation for [PSR-18 interfaces](https://packagist.org/packages/psr/http-client). https://packagist.org/providers/psr/http-client-implementation may help to find some suitable options. + +Then check content types for API requests you intend to send and API responses you intend to receive. For each unique content type you will need an implementation of [`OpenAPIGenerator\APIClient\BodyCoderInterface`](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoderInterface.php) to encode request bodies and decode response bodies. Currently, only [`application/json` body coder](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoder/Json.php) is provided out-of-the-box. + +After that review security requirements for API operations you intend to use. For each unique security scheme you will need an implementation of [OpenAPIGenerator\APIClient\SecurityProviderInterface](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProviderInterface.php). Currently, only [HTTP Bearer authentication](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProvider/HttpBearer.php) is supported out-of-the-box. + +The last step is to configure and wire all services together. It is highly advisable to use [PSR-11 container](https://packagist.org/packages/psr/container) for that. If you have not selected one for your project yet, https://packagist.org/providers/psr/container-implementation may help to find some suitable options. Here is a sample wiring configuration for `"laminas/laminas-servicemanager"`, `"laminas/laminas-diactoros"` and `"symfony/http-client"` (consult generated `composer.json` for the exact versions of used packages): + +```PHP + [ + Psr\Http\Message\RequestFactoryInterface::class => Laminas\Diactoros\RequestFactory::class, + Psr\Http\Message\ResponseFactoryInterface::class => Laminas\Diactoros\ResponseFactory::class, + Psr\Http\Message\StreamFactoryInterface::class => Laminas\Diactoros\StreamFactory::class, + ], + 'factories' => [ + {{invokerPackage}}\ApiClient::class => {{invokerPackage}}\ApiClientFactory::class, + + Articus\DataTransfer\Service::class => Articus\DataTransfer\Factory::class, + Articus\DataTransfer\MetadataProvider\PhpAttribute::class => Articus\DataTransfer\MetadataProvider\Factory\PhpAttribute::class, + Articus\DataTransfer\Strategy\PluginManager::class => Articus\DataTransfer\Strategy\Factory\PluginManager::class, + Articus\DataTransfer\Validator\PluginManager::class => Articus\DataTransfer\Validator\Factory\PluginManager::class, + Laminas\Validator\ValidatorPluginManager::class => Laminas\Validator\ValidatorPluginManagerFactory::class, + + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => OpenAPIGenerator\APIClient\SecurityProvider\Factory\PluginManager::class, + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => OpenAPIGenerator\APIClient\BodyCoder\Factory\PluginManager::class, + + Psr\Http\Client\ClientInterface::class => function (Psr\Container\ContainerInterface $container) + { + return new Symfony\Component\HttpClient\Psr18Client( + new Symfony\Component\HttpClient\NativeHttpClient(), + $container->get(Psr\Http\Message\ResponseFactoryInterface::class), + $container->get(Psr\Http\Message\StreamFactoryInterface::class) + ); + }, + ], + 'aliases' => [ + Articus\DataTransfer\ClassMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\PhpAttribute::class, + Articus\DataTransfer\FieldMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\PhpAttribute::class, + ], +]; +$config = [ + 'dependencies' => $dependencies, + + //Configure DataTransfer library + Articus\DataTransfer\Strategy\PluginManager::class => [ + 'invokables' => [ + 'QueryStringScalar' => OpenAPIGenerator\Common\Strategy\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Strategy\QueryStringScalarArray::class, + ], + 'factories' => [ + 'Date' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDate::class, + 'DateTime' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDateTime::class, + 'ObjectList' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectList::class, + 'ObjectMap' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectMap::class, + 'ScalarList' => OpenAPIGenerator\Common\Strategy\Factory\ScalarList::class, + 'ScalarMap' => OpenAPIGenerator\Common\Strategy\Factory\ScalarMap::class, + ] + ], + Articus\DataTransfer\Validator\PluginManager::class => [ + 'invokables' => [ + 'Scalar' => OpenAPIGenerator\Common\Validator\Scalar::class, + 'QueryStringScalar' => OpenAPIGenerator\Common\Validator\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Validator\QueryStringScalarArray::class, + ], + 'abstract_factories' => [ + Articus\DataTransfer\Validator\Factory\Laminas::class, + ], + ], + 'validators' => [ + 'invokables' => [ + 'Count' => Laminas\Validator\IsCountable::class, + ], + ], + + //Set API server URL here + {{invokerPackage}}\ApiClient::class => [ + //'server_url' => 'https://api.url', + ], + + //Register body coders for used content types here + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => [ + 'factories' => [ + //'another/mime-type' => AnotherMimeTypeBodyCoder::class + ], + ], + + //Register security providers for used security schemes here + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => [ + 'factories' => [ + //'another-security-scheme' => AnotherSecuritySchemeProvider::class, + ], + 'aliases' => [ + //'custom-name-for-htt-bearer' => OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class, + ], + ], +]; +$container = new Laminas\ServiceManager\ServiceManager($dependencies); +$container->setService('config', $config); +$container->setAlias('Config', 'config'); + +/** @var {{invokerPackage}}\ApiClient $client */ +$client = $container->get({{invokerPackage}}\ApiClient::class); +//... and now you can use client methods to call API operations :) + +//And one more sample: how to set token for HTTP Bearer authentication +/** @var OpenAPIGenerator\APIClient\SecurityProvider\PluginManager $securityProviders */ +$securityProviders = $container->get(OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class); +/** @var OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer $httpBearer */ +$httpBearer = $securityProviders->get(OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class); +$httpBearer->setToken('some-token'); + +``` diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_call.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_call.mustache new file mode 100644 index 00000000000..f58c5117731 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_call.mustache @@ -0,0 +1,13 @@ +{{#vendorExtensions}}{{#internal.hasParameterData +}}$parameters{{#bodyParam}}, {{/bodyParam}}{{^bodyParam}}{{#hasAuthMethods}}, {{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}}{{/bodyParam +}}{{/internal.hasParameterData}}{{/vendorExtensions +}}{{#bodyParam +}}$requestContent{{#hasAuthMethods}}, {{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods +}}{{/bodyParam +}}{{#hasAuthMethods +}}$security{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes +}}{{/hasAuthMethods +}}{{#hasConsumes +}}$requestMediaType{{#hasProduces}}, {{/hasProduces +}}{{/hasConsumes +}}{{#hasProduces}}$responseMediaType{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_declaration.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_declaration.mustache new file mode 100644 index 00000000000..081ec85fe11 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_declaration.mustache @@ -0,0 +1,17 @@ +{{#vendorExtensions}} +{{#internal.hasParameterData}} + {{internal.parameterDataType}} $parameters{{#bodyParam}},{{/bodyParam}}{{^bodyParam}}{{#hasAuthMethods}},{{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}}{{/bodyParam}} +{{/internal.hasParameterData}} +{{/vendorExtensions}} +{{#bodyParam}} + {{dataType}} $requestContent{{#hasAuthMethods}},{{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}} +{{/bodyParam}} +{{#hasAuthMethods}} + iterable $security = ['{{authMethods.0.name}}' => [{{#authMethods.0.scopes}}'{{scope}}', {{/authMethods.0.scopes}}]]{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}} +{{/hasAuthMethods}} +{{#hasConsumes}} + string $requestMediaType = '{{consumes.0.mediaType}}'{{#hasProduces}},{{/hasProduces}} +{{/hasConsumes}} +{{#hasProduces}} + string $responseMediaType = '{{produces.0.mediaType}}' +{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_doc.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_doc.mustache new file mode 100644 index 00000000000..cf45f4bb7ff --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/api_arg_doc.mustache @@ -0,0 +1,23 @@ +{{#summary}} + * {{&summary}} +{{/summary}} +{{#description}} + * {{&description}} +{{/description}} +{{#vendorExtensions}} +{{#internal.hasParameterData}} + * @param {{internal.parameterDataType}} $parameters +{{/internal.hasParameterData}} +{{/vendorExtensions}} +{{#bodyParam}} + * @param {{dataType}} $requestContent +{{/bodyParam}} +{{#hasAuthMethods}} + * @param iterable|string[][] $security +{{/hasAuthMethods}} +{{#hasConsumes}} + * @param string $requestMediaType +{{/hasConsumes}} +{{#hasProduces}} + * @param string $responseMediaType +{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/composer.json.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/composer.json.mustache new file mode 100644 index 00000000000..2ca459e6524 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/composer.json.mustache @@ -0,0 +1,26 @@ +{ + "name": "{{#lambda.lowercase}}{{gitUserId}}/{{gitRepoId}}{{/lambda.lowercase}}", + "description": "{{description}}", + "license": "unlicense", + "version": "{{artifactVersion}}", + "type": "library", + "require": { + "php": "^8.0", + "articus/data-transfer": "^0.5", + "articus/openapi-generator-common": "^0.2", + "articus/openapi-generator-apiclient": "^0.1", + "psr/simple-cache": "^1.0", + "laminas/laminas-stdlib": "^3.2", + "laminas/laminas-validator": "^2.13" + }, + "autoload": { + "psr-4": { + "": "{{srcBasePath}}/" + } + }, + "require-dev": { + "laminas/laminas-servicemanager": "^3.6", + "laminas/laminas-diactoros": "^2.6", + "symfony/http-client": "^5.3" + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/gitignore b/modules/openapi-generator/src/main/resources/php-dt-modern/gitignore new file mode 100644 index 00000000000..f674bbd2d1f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/gitignore @@ -0,0 +1,6 @@ +#based on .gitignore generated by https://github.com/zendframework/zend-expressive-skeleton +.idea + +# Composer files +composer.phar +vendor/ diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/list_item_type.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/list_item_type.mustache new file mode 100644 index 00000000000..25467661433 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/list_item_type.mustache @@ -0,0 +1,8 @@ +{{#items +}}{{^isContainer +}}{{#isPrimitiveType}}"{{dataType}}"{{/isPrimitiveType +}}{{^isPrimitiveType}}{{dataType}}::class{{/isPrimitiveType +}}{{/isContainer +}}{{#isContainer +}}{{dataType}}::class{{/isContainer +}}{{/items}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/map_item_type.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/map_item_type.mustache new file mode 100644 index 00000000000..a58e19beca5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/map_item_type.mustache @@ -0,0 +1,8 @@ +{{#additionalProperties +}}{{^isContainer +}}{{#isPrimitiveType}}"{{dataType}}"{{/isPrimitiveType +}}{{^isPrimitiveType}}{{dataType}}::class{{/isPrimitiveType +}}{{/isContainer +}}{{#isContainer +}}{{dataType}}::class{{/isContainer +}}{{/additionalProperties}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/model.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/model.mustache new file mode 100644 index 00000000000..98a5149c89b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/model.mustache @@ -0,0 +1,13 @@ +model_container}}{{/internal.fromContainer +}}{{^internal.fromContainer}}{{>model_object}}{{/internal.fromContainer +}}{{/vendorExtensions +}}{{^vendorExtensions}}{{>model_object}}{{/vendorExtensions +}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/model_container.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/model_container.mustache new file mode 100644 index 00000000000..543194c798b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/model_container.mustache @@ -0,0 +1,57 @@ +{{#vars +}}{{#isArray +}}#[DTA\Strategy("{{#isPrimitiveType}}ScalarList{{/isPrimitiveType}}{{^isPrimitiveType}}ObjectList{{/isPrimitiveType}}", ["type" => {{>list_item_type}}])] +{{#minItems}}{{^maxItems +}}#[DTA\Validator("Count", ["min" => {{minItems}}], blocker: true)] +{{/maxItems}}{{/minItems +}}{{^minItems}}{{#maxItems +}}#[DTA\Validator("Count", ["max" => {{maxItems}}], blocker: true)] +{{/maxItems}}{{/minItems +}}{{#minItems}}{{#maxItems +}}#[DTA\Validator("Count", ["min" => {{minItems}}, "max" => {{maxItems}}], blocker: true)] +{{/maxItems}}{{/minItems +}}#[DTA\Validator("Collection", ["validators" => [ +{{#isPrimitiveType +}} ["name" => "Scalar", "options" => ["type" => {{>list_item_type}}]] +{{/isPrimitiveType +}}{{#isDate +}} ["name" => "Date"] +{{/isDate +}}{{#isDateTime +}} ["name" => "Date", "options" => ["format" => \DateTime::RFC3339]] +{{/isDateTime +}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime +}} ["name" => "TypeCompliant", "options" => ["type" => {{>list_item_type}}]] +{{/isDateTime}}{{/isDate}}{{/isPrimitiveType +}}]])] +{{/isArray +}}{{#isMap +}}#[DTA\Strategy("{{#isPrimitiveType}}ScalarMap{{/isPrimitiveType}}{{^isPrimitiveType}}ObjectMap{{/isPrimitiveType}}", ["type" => {{>map_item_type}}])] +{{#minProperties}}{{^maxProperties +}}#[DTA\Validator("Count", ["min" => {{minProperties}}], blocker: true)] +{{/maxProperties}}{{/minProperties +}}{{^minProperties}}{{#maxProperties +}}#[DTA\Validator("Count", ["max" => {{maxProperties}}], blocker: true)] +{{/maxProperties}}{{/minProperties +}}{{#minProperties}}{{#maxProperties +}}#[DTA\Validator("Count", ["min" => {{minProperties}}, "max" => {{maxProperties}}], blocker: true)] +{{/maxProperties}}{{/minProperties +}}#[DTA\Validator("Collection", ["validators" => [ +{{#isPrimitiveType +}} ["name" => "Scalar", "options" => ["type" => {{>map_item_type}}]] +{{/isPrimitiveType +}}{{#isDate +}} ["name" => "Date"] +{{/isDate +}}{{#isDateTime +}} ["name" => "Date", "options" => ["format" => \DateTime::RFC3339]] +{{/isDateTime +}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime +}} ["name" => "TypeCompliant", "options" => ["type" => {{>map_item_type}}]] +{{/isDateTime}}{{/isDate}}{{/isPrimitiveType +}}]])] +{{/isMap +}}{{/vars +}}class {{classname}} extends \ArrayObject +{ +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/model_normal_var.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/model_normal_var.mustache new file mode 100644 index 00000000000..8465d19c5d6 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/model_normal_var.mustache @@ -0,0 +1,45 @@ +{{#isContainer +}} #[DTA\Strategy("Object", ["type" => {{internal.containerDataType}}::class])] + #[DTA\Validator("TypeCompliant", ["type" => {{internal.containerDataType}}::class])] +{{/isContainer +}}{{^isContainer +}}{{#isPrimitiveType +}} #[DTA\Validator("Scalar", ["type" => "{{dataType}}"])] +{{/isPrimitiveType +}}{{#isDate +}} #[DTA\Strategy("Date")] + #[DTA\Validator("Date")] +{{/isDate +}}{{#isDateTime +}} #[DTA\Strategy("DateTime")] + #[DTA\Validator("Date", ["format" => \DateTime::RFC3339])] +{{/isDateTime +}}{{^isPrimitiveType +}}{{^isDate +}}{{^isDateTime +}} #[DTA\Strategy("Object", ["type" => {{dataType}}::class])] + #[DTA\Validator("TypeCompliant", ["type" => {{dataType}}::class])] +{{/isDateTime +}}{{/isDate +}}{{/isPrimitiveType +}}{{/isContainer +}}{{#hasValidation +}}{{#minLength}}{{#maxLength +}} #[DTA\Validator("StringLength", ["min" => {{minLength}}, "max" => {{maxLength}}])] +{{/maxLength}}{{/minLength +}}{{^minLength}}{{#maxLength +}} #[DTA\Validator("StringLength", ["max" => {{maxLength}}])] +{{/maxLength}}{{/minLength +}}{{#minLength}}{{^maxLength +}} #[DTA\Validator("StringLength", ["min" => {{minLength}}])] +{{/maxLength}}{{/minLength +}}{{#minimum +}} #[DTA\Validator("GreaterThan", ["min" => {{minimum}}{{^exclusiveMinimum}}, "inclusive" => true{{/exclusiveMinimum}}])] +{{/minimum +}}{{#maximum +}} #[DTA\Validator("LessThan", ["max" => {{maximum}}{{^exclusiveMaximum}}, "inclusive" => true{{/exclusiveMaximum}}])] +{{/maximum +}}{{#pattern +}} #[DTA\Validator("Regex", ["pattern" => "{{{pattern}}}"])] +{{/pattern +}}{{/hasValidation}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/model_object.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/model_object.mustache new file mode 100644 index 00000000000..1775708b578 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/model_object.mustache @@ -0,0 +1,23 @@ +{{#description +}}/** + * {{description}} + */ +{{/description +}}class {{classname}} +{ +{{#vars +}}{{#description +}} /** + * {{description}} + */ +{{/description +}} #[DTA\Data({{#vendorExtensions}}{{#internal.fromParameters}}subset: "{{internal.parameterLocation}}", {{/internal.fromParameters}}{{/vendorExtensions}}field: "{{baseName}}"{{^required}}, nullable: true{{/required}})] +{{#vendorExtensions +}}{{#internal.fromParameters}}{{>model_query_var}}{{/internal.fromParameters +}}{{^internal.fromParameters}}{{>model_normal_var}}{{/internal.fromParameters +}}{{/vendorExtensions +}}{{^vendorExtensions}}{{>model_normal_var}}{{/vendorExtensions +}} public {{dataType}}|null ${{name}} = null; + +{{/vars +}}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt-modern/model_query_var.mustache b/modules/openapi-generator/src/main/resources/php-dt-modern/model_query_var.mustache new file mode 100644 index 00000000000..a81d14f0ed1 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt-modern/model_query_var.mustache @@ -0,0 +1,51 @@ +{{#isArray +}}{{#isPrimitiveType +}} #[DTA\Strategy("QueryStringScalarArray", ["type" => {{>list_item_type}}, "format" => "{{internal.collectionFormat}}"], "{{internal.parameterLocation}}")] + #[DTA\Validator("QueryStringScalarArray", ["type" => {{>list_item_type}}, "format" => "{{internal.collectionFormat}}"{{#minItems}}, "min_items" => {{minItems}}{{/minItems}}{{#maxItems}}, "max_items" => {{maxItems}}{{/maxItems}}], subset: "{{internal.parameterLocation}}")] +{{/isPrimitiveType +}}{{^isPrimitiveType +}} // TODO add validator(s) and strategy for list of {{>list_item_type}} and collection format {{internal.collectionFormat}} inside query string +{{/isPrimitiveType +}}{{/isArray +}}{{#isMap +}} // TODO add validator(s) and strategy for map of {{>map_item_type}} and collection format {{internal.collectionFormat}} inside query string +{{/isMap +}}{{^isContainer +}}{{#isPrimitiveType +}} #[DTA\Strategy("QueryStringScalar", ["type" => "{{dataType}}"], "{{internal.parameterLocation}}")] + #[DTA\Validator("QueryStringScalar", ["type" => "{{dataType}}"], subset: "{{internal.parameterLocation}}")] +{{/isPrimitiveType +}}{{#isDate +}} #[DTA\Strategy("Date", subset: "{{internal.parameterLocation}}")] + #[DTA\Validator("Date", subset: "{{internal.parameterLocation}}")] +{{/isDate +}}{{#isDateTime +}} #[DTA\Strategy("DateTime", subset: "{{internal.parameterLocation}}")] + #[DTA\Validator("Date", ["format" => \DateTime::RFC3339], subset: "{{internal.parameterLocation}}")] +{{/isDateTime +}}{{^isPrimitiveType +}}{{^isDate}}{{^isDateTime +}} // TODO add validator(s) and strategy for {{dataType}} inside query string +{{/isDateTime}}{{/isDate +}}{{/isPrimitiveType +}}{{/isContainer +}}{{#hasValidation +}}{{#minLength}}{{#maxLength +}} #[DTA\Validator("StringLength", ["min" => {{minLength}}, "max" => {{maxLength}}], subset: "{{internal.parameterLocation}}")] +{{/maxLength}}{{/minLength +}}{{^minLength}}{{#maxLength +}} #[DTA\Validator("StringLength", ["max" => {{maxLength}}], subset: "{{internal.parameterLocation}}")] +{{/maxLength}}{{/minLength +}}{{#minLength}}{{^maxLength +}} #[DTA\Validator("StringLength", ["min" => {{minLength}}], subset: "{{internal.parameterLocation}}")] +{{/maxLength}}{{/minLength +}}{{#minimum +}} #[DTA\Validator("GreaterThan", ["min" => {{minimum}}{{^exclusiveMinimum}}, "inclusive" => true{{/exclusiveMinimum}}], subset: "{{internal.parameterLocation}}")] +{{/minimum +}}{{#maximum +}} #[DTA\Validator("LessThan", ["max" => {{maximum}}{{^exclusiveMaximum}}, "inclusive" => true{{/exclusiveMaximum}}], subset: "{{internal.parameterLocation}}")] +{{/maximum +}}{{#pattern +}} #[DTA\Validator("Regex", ["pattern" => "{{{pattern}}}"], subset: "{{internal.parameterLocation}}")] +{{/pattern +}}{{/hasValidation}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/ApiClient.php.mustache b/modules/openapi-generator/src/main/resources/php-dt/ApiClient.php.mustache new file mode 100644 index 00000000000..b86f285a0a7 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/ApiClient.php.mustache @@ -0,0 +1,123 @@ +api_arg_doc +}} * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function {{operationId}}Raw( +{{>api_arg_declaration +}} ): ResponseInterface + { + $request = $this->createRequest('{{httpMethod}}', '{{path}}', {{#pathParams.0}}$this->getPathParameters($parameters){{/pathParams.0}}{{^pathParams.0}}[]{{/pathParams.0}}, {{#queryParams.0}}$this->getQueryParameters($parameters){{/queryParams.0}}{{^queryParams.0}}[]{{/queryParams.0}}); +{{#headerParams.0}} + $request = $this->addCustomHeaders($request, $parameters); +{{/headerParams.0}} +{{#cookieParams.0}} + $request = $this->addCookies($request, $parameters); +{{/cookieParams.0}} +{{#bodyParam}} + $request = $this->addBody($request, $requestMediaType, $requestContent); +{{/bodyParam}} +{{#hasProduces}} + $request = $this->addAcceptHeader($request, $responseMediaType); +{{/hasProduces}} +{{#hasAuthMethods}} + $request = $this->addSecurity($request, $security); +{{/hasAuthMethods}} + return $this->httpClient->sendRequest($request); + } + + /** +{{>api_arg_doc +}} * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function {{operationId}}( +{{>api_arg_declaration +}} ): array + { + $response = $this->{{operationId}}Raw({{>api_arg_call}}); + $responseContent = null; + switch ($response->getStatusCode()) + { +{{#responses}} + {{#isDefault}}default{{/isDefault}}{{^isDefault}}case {{code}}{{/isDefault}}: +{{#message}} + /* {{&message}} */ +{{/message}} +{{#isModel}} + $responseContent = new {{dataType}}(); +{{/isModel}} +{{^isModel}} +{{#isArray}} + $responseContent = new {{dataType}}(); +{{/isArray}} +{{/isModel}} +{{^isModel}} +{{^isArray}} +{{#isMap}} + $responseContent = new {{dataType}}(); +{{/isMap}} +{{/isArray}} +{{/isModel}} + break; +{{/responses}} + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** +{{>api_arg_doc +}} * @return {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}mixed{{/returnType}} + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function {{operationId}}Result( +{{>api_arg_declaration +}} ){{#returnType}}: {{returnType}}{{/returnType}} + { + return $this->getSuccessfulContent(...$this->{{operationId}}({{>api_arg_call}})); + } + //endregion +{{^-last}} + +{{/-last}} +{{/operation}} +} + +{{/operations}} +{{/apis}} +{{/apiInfo}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/ApiClientFactory.php.mustache b/modules/openapi-generator/src/main/resources/php-dt/ApiClientFactory.php.mustache new file mode 100644 index 00000000000..a36880d3d84 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/ApiClientFactory.php.mustache @@ -0,0 +1,30 @@ +getServiceConfig($container), $options ?? [])); + return new ApiClient( + $config->serverUrl, + $container->get($config->dataTransferServiceName), + $container->get($config->requestFactoryServiceName), + $container->get($config->httpClientServiceName), + $container->get($config->securityProviderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName) + ); + } +} diff --git a/modules/openapi-generator/src/main/resources/php-dt/README.md.mustache b/modules/openapi-generator/src/main/resources/php-dt/README.md.mustache new file mode 100644 index 00000000000..0185e9584ce --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/README.md.mustache @@ -0,0 +1,135 @@ +# Client library for {{appName}} + +Generated by the [OpenAPI Generator](https://openapi-generator.tech) project. + +## Overview +This lightweight extensible client library is [PSR-7](https://www.php-fig.org/psr/psr-7), [PSR-11](https://www.php-fig.org/psr/psr-11), [PSR-17](https://www.php-fig.org/psr/psr-17) and [PSR-18](https://www.php-fig.org/psr/psr-18) complaint and relies on: + +- PHP: >=7.3 +- [Data Transfer](https://github.com/Articus/DataTransfer): >=0.5 + + +## How to use + +This library can be used either as a separate package (just deploy generated files to your package repository and add dependency `"{{#lambda.lowercase}}{{gitUserId}}/{{gitRepoId}}{{/lambda.lowercase}}":"{{artifactVersion}}"` to your project `composer.json`) or as a part of your project (just copy generated code from `{{srcBasePath}}` and merge generated `composer.json` into your project `composer.json`). + +First you need an implementation for [PSR-7](https://packagist.org/packages/psr/http-message) and [PSR-17](https://packagist.org/packages/psr/http-factory) interfaces. Usually it is a single package, and your project might already have one among its dependencies (for example if it is some web service). Otherwise, https://packagist.org/providers/psr/http-message-implementation and https://packagist.org/providers/psr/http-factory-implementation may help to find some suitable options. + +Next choose an implementation for [PSR-18 interfaces](https://packagist.org/packages/psr/http-client). https://packagist.org/providers/psr/http-client-implementation may help to find some suitable options. + +Then check content types for API requests you intend to send and API responses you intend to receive. For each unique content type you will need an implementation of [`OpenAPIGenerator\APIClient\BodyCoderInterface`](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoderInterface.php) to encode request bodies and decode response bodies. Currently, only [`application/json` body coder](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoder/Json.php) is provided out-of-the-box. + +After that review security requirements for API operations you intend to use. For each unique security scheme you will need an implementation of [OpenAPIGenerator\APIClient\SecurityProviderInterface](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProviderInterface.php). Currently, only [HTTP Bearer authentication](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProvider/HttpBearer.php) is supported out-of-the-box. + +The last step is to configure and wire all services together. It is highly advisable to use [PSR-11 container](https://packagist.org/packages/psr/container) for that. If you have not selected one for your project yet, https://packagist.org/providers/psr/container-implementation may help to find some suitable options. Here is a sample wiring configuration for `"laminas/laminas-servicemanager"`, `"laminas/laminas-diactoros"` and `"symfony/http-client"` (consult generated `composer.json` for the exact versions of used packages): + +```PHP + [ + Psr\Http\Message\RequestFactoryInterface::class => Laminas\Diactoros\RequestFactory::class, + Psr\Http\Message\ResponseFactoryInterface::class => Laminas\Diactoros\ResponseFactory::class, + Psr\Http\Message\StreamFactoryInterface::class => Laminas\Diactoros\StreamFactory::class, + ], + 'factories' => [ + {{invokerPackage}}\ApiClient::class => {{invokerPackage}}\ApiClientFactory::class, + + Articus\DataTransfer\Service::class => Articus\DataTransfer\Factory::class, + Articus\DataTransfer\MetadataProvider\Annotation::class => Articus\DataTransfer\MetadataProvider\Factory\Annotation::class, + Articus\DataTransfer\Strategy\PluginManager::class => Articus\DataTransfer\Strategy\Factory\PluginManager::class, + Articus\DataTransfer\Validator\PluginManager::class => Articus\DataTransfer\Validator\Factory\PluginManager::class, + Laminas\Validator\ValidatorPluginManager::class => Laminas\Validator\ValidatorPluginManagerFactory::class, + + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => OpenAPIGenerator\APIClient\SecurityProvider\Factory\PluginManager::class, + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => OpenAPIGenerator\APIClient\BodyCoder\Factory\PluginManager::class, + + Psr\Http\Client\ClientInterface::class => function (Psr\Container\ContainerInterface $container) + { + return new Symfony\Component\HttpClient\Psr18Client( + new Symfony\Component\HttpClient\NativeHttpClient(), + $container->get(Psr\Http\Message\ResponseFactoryInterface::class), + $container->get(Psr\Http\Message\StreamFactoryInterface::class) + ); + }, + ], + 'aliases' => [ + Articus\DataTransfer\ClassMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\Annotation::class, + Articus\DataTransfer\FieldMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\Annotation::class, + ], +]; +$config = [ + 'dependencies' => $dependencies, + + //Configure DataTransfer library + Articus\DataTransfer\Strategy\PluginManager::class => [ + 'invokables' => [ + 'QueryStringScalar' => OpenAPIGenerator\Common\Strategy\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Strategy\QueryStringScalarArray::class, + ], + 'factories' => [ + 'Date' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDate::class, + 'DateTime' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDateTime::class, + 'ObjectList' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectList::class, + 'ObjectMap' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectMap::class, + 'ScalarList' => OpenAPIGenerator\Common\Strategy\Factory\ScalarList::class, + 'ScalarMap' => OpenAPIGenerator\Common\Strategy\Factory\ScalarMap::class, + ] + ], + Articus\DataTransfer\Validator\PluginManager::class => [ + 'invokables' => [ + 'Scalar' => OpenAPIGenerator\Common\Validator\Scalar::class, + 'QueryStringScalar' => OpenAPIGenerator\Common\Validator\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Validator\QueryStringScalarArray::class, + ], + 'abstract_factories' => [ + Articus\DataTransfer\Validator\Factory\Laminas::class, + ], + ], + 'validators' => [ + 'invokables' => [ + 'Count' => Laminas\Validator\IsCountable::class, + ], + ], + + //Set API server URL here + {{invokerPackage}}\ApiClient::class => [ + //'server_url' => 'https://api.url', + ], + + //Register body coders for used content types here + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => [ + 'factories' => [ + //'another/mime-type' => AnotherMimeTypeBodyCoder::class + ], + ], + + //Register security providers for used security schemes here + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => [ + 'factories' => [ + //'another-security-scheme' => AnotherSecuritySchemeProvider::class, + ], + 'aliases' => [ + //'custom-name-for-htt-bearer' => OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class, + ], + ], +]; +$container = new Laminas\ServiceManager\ServiceManager($dependencies); +$container->setService('config', $config); +$container->setAlias('Config', 'config'); + +/** @var {{invokerPackage}}\ApiClient $client */ +$client = $container->get({{invokerPackage}}\ApiClient::class); +//... and now you can use client methods to call API operations :) + +//And one more sample: how to set token for HTTP Bearer authentication +/** @var OpenAPIGenerator\APIClient\SecurityProvider\PluginManager $securityProviders */ +$securityProviders = $container->get(OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class); +/** @var OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer $httpBearer */ +$httpBearer = $securityProviders->get(OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class); +$httpBearer->setToken('some-token'); + +``` diff --git a/modules/openapi-generator/src/main/resources/php-dt/api_arg_call.mustache b/modules/openapi-generator/src/main/resources/php-dt/api_arg_call.mustache new file mode 100644 index 00000000000..f58c5117731 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/api_arg_call.mustache @@ -0,0 +1,13 @@ +{{#vendorExtensions}}{{#internal.hasParameterData +}}$parameters{{#bodyParam}}, {{/bodyParam}}{{^bodyParam}}{{#hasAuthMethods}}, {{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}}{{/bodyParam +}}{{/internal.hasParameterData}}{{/vendorExtensions +}}{{#bodyParam +}}$requestContent{{#hasAuthMethods}}, {{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods +}}{{/bodyParam +}}{{#hasAuthMethods +}}$security{{#hasConsumes}}, {{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}}, {{/hasProduces}}{{/hasConsumes +}}{{/hasAuthMethods +}}{{#hasConsumes +}}$requestMediaType{{#hasProduces}}, {{/hasProduces +}}{{/hasConsumes +}}{{#hasProduces}}$responseMediaType{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/api_arg_declaration.mustache b/modules/openapi-generator/src/main/resources/php-dt/api_arg_declaration.mustache new file mode 100644 index 00000000000..081ec85fe11 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/api_arg_declaration.mustache @@ -0,0 +1,17 @@ +{{#vendorExtensions}} +{{#internal.hasParameterData}} + {{internal.parameterDataType}} $parameters{{#bodyParam}},{{/bodyParam}}{{^bodyParam}}{{#hasAuthMethods}},{{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}}{{/bodyParam}} +{{/internal.hasParameterData}} +{{/vendorExtensions}} +{{#bodyParam}} + {{dataType}} $requestContent{{#hasAuthMethods}},{{/hasAuthMethods}}{{^hasAuthMethods}}{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}}{{/hasAuthMethods}} +{{/bodyParam}} +{{#hasAuthMethods}} + iterable $security = ['{{authMethods.0.name}}' => [{{#authMethods.0.scopes}}'{{scope}}', {{/authMethods.0.scopes}}]]{{#hasConsumes}},{{/hasConsumes}}{{^hasConsumes}}{{#hasProduces}},{{/hasProduces}}{{/hasConsumes}} +{{/hasAuthMethods}} +{{#hasConsumes}} + string $requestMediaType = '{{consumes.0.mediaType}}'{{#hasProduces}},{{/hasProduces}} +{{/hasConsumes}} +{{#hasProduces}} + string $responseMediaType = '{{produces.0.mediaType}}' +{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/api_arg_doc.mustache b/modules/openapi-generator/src/main/resources/php-dt/api_arg_doc.mustache new file mode 100644 index 00000000000..cf45f4bb7ff --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/api_arg_doc.mustache @@ -0,0 +1,23 @@ +{{#summary}} + * {{&summary}} +{{/summary}} +{{#description}} + * {{&description}} +{{/description}} +{{#vendorExtensions}} +{{#internal.hasParameterData}} + * @param {{internal.parameterDataType}} $parameters +{{/internal.hasParameterData}} +{{/vendorExtensions}} +{{#bodyParam}} + * @param {{dataType}} $requestContent +{{/bodyParam}} +{{#hasAuthMethods}} + * @param iterable|string[][] $security +{{/hasAuthMethods}} +{{#hasConsumes}} + * @param string $requestMediaType +{{/hasConsumes}} +{{#hasProduces}} + * @param string $responseMediaType +{{/hasProduces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/composer.json.mustache b/modules/openapi-generator/src/main/resources/php-dt/composer.json.mustache new file mode 100644 index 00000000000..a0d5ae7066c --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/composer.json.mustache @@ -0,0 +1,27 @@ +{ + "name": "{{#lambda.lowercase}}{{gitUserId}}/{{gitRepoId}}{{/lambda.lowercase}}", + "description": "{{description}}", + "license": "unlicense", + "version": "{{artifactVersion}}", + "type": "library", + "require": { + "php": "^7.3 || ^8.0", + "articus/data-transfer": "^0.5", + "articus/openapi-generator-common": "^0.2", + "articus/openapi-generator-apiclient": "^0.1", + "doctrine/annotations": "^1.10", + "psr/simple-cache": "^1.0", + "laminas/laminas-stdlib": "^3.2", + "laminas/laminas-validator": "^2.13" + }, + "autoload": { + "psr-4": { + "": "{{srcBasePath}}/" + } + }, + "require-dev": { + "laminas/laminas-servicemanager": "^3.6", + "laminas/laminas-diactoros": "^2.6", + "symfony/http-client": "^5.3" + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/gitignore b/modules/openapi-generator/src/main/resources/php-dt/gitignore new file mode 100644 index 00000000000..f674bbd2d1f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/gitignore @@ -0,0 +1,6 @@ +#based on .gitignore generated by https://github.com/zendframework/zend-expressive-skeleton +.idea + +# Composer files +composer.phar +vendor/ diff --git a/modules/openapi-generator/src/main/resources/php-dt/list_item_type.mustache b/modules/openapi-generator/src/main/resources/php-dt/list_item_type.mustache new file mode 100644 index 00000000000..25467661433 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/list_item_type.mustache @@ -0,0 +1,8 @@ +{{#items +}}{{^isContainer +}}{{#isPrimitiveType}}"{{dataType}}"{{/isPrimitiveType +}}{{^isPrimitiveType}}{{dataType}}::class{{/isPrimitiveType +}}{{/isContainer +}}{{#isContainer +}}{{dataType}}::class{{/isContainer +}}{{/items}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/map_item_type.mustache b/modules/openapi-generator/src/main/resources/php-dt/map_item_type.mustache new file mode 100644 index 00000000000..a58e19beca5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/map_item_type.mustache @@ -0,0 +1,8 @@ +{{#additionalProperties +}}{{^isContainer +}}{{#isPrimitiveType}}"{{dataType}}"{{/isPrimitiveType +}}{{^isPrimitiveType}}{{dataType}}::class{{/isPrimitiveType +}}{{/isContainer +}}{{#isContainer +}}{{dataType}}::class{{/isContainer +}}{{/additionalProperties}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/model.mustache b/modules/openapi-generator/src/main/resources/php-dt/model.mustache new file mode 100644 index 00000000000..612c5620938 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/model.mustache @@ -0,0 +1,13 @@ +model_container}}{{/internal.fromContainer +}}{{^internal.fromContainer}}{{>model_object}}{{/internal.fromContainer +}}{{/vendorExtensions +}}{{^vendorExtensions}}{{>model_object}}{{/vendorExtensions +}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/php-dt/model_container.mustache b/modules/openapi-generator/src/main/resources/php-dt/model_container.mustache new file mode 100644 index 00000000000..bbecf5ed190 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/model_container.mustache @@ -0,0 +1,59 @@ +/** +{{#vars +}}{{#isArray +}} * @DTA\Strategy(name="{{#isPrimitiveType}}ScalarList{{/isPrimitiveType}}{{^isPrimitiveType}}ObjectList{{/isPrimitiveType}}", options={"type":{{>list_item_type}}}) +{{#minItems}}{{^maxItems +}} * @DTA\Validator(name="Count", options={"min":{{minItems}}}, blocker=true) +{{/maxItems}}{{/minItems +}}{{^minItems}}{{#maxItems +}} * @DTA\Validator(name="Count", options={"max":{{maxItems}}}, blocker=true) +{{/maxItems}}{{/minItems +}}{{#minItems}}{{#maxItems +}} * @DTA\Validator(name="Count", options={"min":{{minItems}},"max":{{maxItems}}}, blocker=true) +{{/maxItems}}{{/minItems +}} * @DTA\Validator(name="Collection", options={"validators":{ +{{#isPrimitiveType +}} * {"name":"Scalar", "options":{"type":{{>list_item_type}}}} +{{/isPrimitiveType +}}{{#isDate +}} * {"name":"Date"} +{{/isDate +}}{{#isDateTime +}} * {"name":"Date", "options":{"format": \DateTime::RFC3339}} +{{/isDateTime +}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime +}} * {"name":"TypeCompliant", "options":{"type":{{>list_item_type}}}} +{{/isDateTime}}{{/isDate}}{{/isPrimitiveType +}} * }}) +{{/isArray +}}{{#isMap +}} * @DTA\Strategy(name="{{#isPrimitiveType}}ScalarMap{{/isPrimitiveType}}{{^isPrimitiveType}}ObjectMap{{/isPrimitiveType}}", options={"type":{{>map_item_type}}}) +{{#minProperties}}{{^maxProperties +}} * @DTA\Validator(name="Count", options={"min":{{minProperties}}}, blocker=true) +{{/maxProperties}}{{/minProperties +}}{{^minProperties}}{{#maxProperties +}} * @DTA\Validator(name="Count", options={"max":{{maxProperties}}}, blocker=true) +{{/maxProperties}}{{/minProperties +}}{{#minProperties}}{{#maxProperties +}} * @DTA\Validator(name="Count", options={"min":{{minProperties}},"max":{{maxProperties}}}, blocker=true) +{{/maxProperties}}{{/minProperties +}} * @DTA\Validator(name="Collection", options={"validators":{ +{{#isPrimitiveType +}} * {"name":"Scalar", "options":{"type":{{>map_item_type}}}} +{{/isPrimitiveType +}}{{#isDate +}} * {"name":"Date"} +{{/isDate +}}{{#isDateTime +}} * {"name":"Date", "options":{"format": \DateTime::RFC3339}} +{{/isDateTime +}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime +}} * {"name":"TypeCompliant", "options":{"type":{{>map_item_type}}}} +{{/isDateTime}}{{/isDate}}{{/isPrimitiveType +}} * }}) +{{/isMap +}}{{/vars +}} */ +class {{classname}} extends \ArrayObject +{ +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/model_normal_var.mustache b/modules/openapi-generator/src/main/resources/php-dt/model_normal_var.mustache new file mode 100644 index 00000000000..1354c0eeda6 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/model_normal_var.mustache @@ -0,0 +1,45 @@ +{{#isContainer +}} * @DTA\Strategy(name="Object", options={"type":{{internal.containerDataType}}::class}) + * @DTA\Validator(name="TypeCompliant", options={"type":{{internal.containerDataType}}::class}) +{{/isContainer +}}{{^isContainer +}}{{#isPrimitiveType +}} * @DTA\Validator(name="Scalar", options={"type":"{{dataType}}"}) +{{/isPrimitiveType +}}{{#isDate +}} * @DTA\Strategy(name="Date") + * @DTA\Validator(name="Date") +{{/isDate +}}{{#isDateTime +}} * @DTA\Strategy(name="DateTime") + * @DTA\Validator(name="Date", options={"format": \DateTime::RFC3339}) +{{/isDateTime +}}{{^isPrimitiveType +}}{{^isDate +}}{{^isDateTime +}} * @DTA\Strategy(name="Object", options={"type":{{dataType}}::class}) + * @DTA\Validator(name="TypeCompliant", options={"type":{{dataType}}::class}) +{{/isDateTime +}}{{/isDate +}}{{/isPrimitiveType +}}{{/isContainer +}}{{#hasValidation +}}{{#minLength}}{{#maxLength +}} * @DTA\Validator(name="StringLength", options={"min":{{minLength}}, "max":{{maxLength}}}) +{{/maxLength}}{{/minLength +}}{{^minLength}}{{#maxLength +}} * @DTA\Validator(name="StringLength", options={"max":{{maxLength}}}) +{{/maxLength}}{{/minLength +}}{{#minLength}}{{^maxLength +}} * @DTA\Validator(name="StringLength", options={"min":{{minLength}}}) +{{/maxLength}}{{/minLength +}}{{#minimum +}} * @DTA\Validator(name="GreaterThan", options={"min":{{minimum}}{{^exclusiveMinimum}}, "inclusive":true{{/exclusiveMinimum}}}) +{{/minimum +}}{{#maximum +}} * @DTA\Validator(name="LessThan", options={"max":{{maximum}}{{^exclusiveMaximum}}, "inclusive":true{{/exclusiveMaximum}}}) +{{/maximum +}}{{#pattern +}} * @DTA\Validator(name="Regex", options={"pattern":"{{{pattern}}}"}) +{{/pattern +}}{{/hasValidation}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/model_object.mustache b/modules/openapi-generator/src/main/resources/php-dt/model_object.mustache new file mode 100644 index 00000000000..e47e48981aa --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/model_object.mustache @@ -0,0 +1,24 @@ +/** +{{#description +}} * {{description}} +{{/description +}} */ +class {{classname}} +{ +{{#vars +}} /** +{{#description +}} * {{description}} +{{/description +}} * @DTA\Data({{#vendorExtensions}}{{#internal.fromParameters}}subset="{{internal.parameterLocation}}", {{/internal.fromParameters}}{{/vendorExtensions}}field="{{baseName}}"{{^required}}, nullable=true{{/required}}) +{{#vendorExtensions +}}{{#internal.fromParameters}}{{>model_query_var}}{{/internal.fromParameters +}}{{^internal.fromParameters}}{{>model_normal_var}}{{/internal.fromParameters +}}{{/vendorExtensions +}}{{^vendorExtensions}}{{>model_normal_var}}{{/vendorExtensions +}} * @var {{dataType}}|null + */ + public ${{name}}; + +{{/vars +}}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/php-dt/model_query_var.mustache b/modules/openapi-generator/src/main/resources/php-dt/model_query_var.mustache new file mode 100644 index 00000000000..44a7a618eda --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-dt/model_query_var.mustache @@ -0,0 +1,51 @@ +{{#isArray +}}{{#isPrimitiveType +}} * @DTA\Strategy(subset="{{internal.parameterLocation}}", name="QueryStringScalarArray", options={"type":{{>list_item_type}}, "format":"{{internal.collectionFormat}}"}) + * @DTA\Validator(subset="{{internal.parameterLocation}}", name="QueryStringScalarArray", options={"type":{{>list_item_type}}, "format":"{{internal.collectionFormat}}"{{#minItems}}, "min_items":{{minItems}}{{/minItems}}{{#maxItems}}, "max_items":{{maxItems}}{{/maxItems}}}) +{{/isPrimitiveType +}}{{^isPrimitiveType +}} * TODO add validator(s) and strategy for list of {{>list_item_type}} and collection format {{internal.collectionFormat}} inside query string +{{/isPrimitiveType +}}{{/isArray +}}{{#isMap +}} * TODO add validator(s) and strategy for map of {{>map_item_type}} and collection format {{internal.collectionFormat}} inside query string +{{/isMap +}}{{^isContainer +}}{{#isPrimitiveType +}} * @DTA\Strategy(subset="{{internal.parameterLocation}}", name="QueryStringScalar", options={"type":"{{dataType}}"}) + * @DTA\Validator(subset="{{internal.parameterLocation}}", name="QueryStringScalar", options={"type":"{{dataType}}"}) +{{/isPrimitiveType +}}{{#isDate +}} * @DTA\Strategy(subset="{{internal.parameterLocation}}", name="Date") + * @DTA\Validator(subset="{{internal.parameterLocation}}", name="Date") +{{/isDate +}}{{#isDateTime +}} * @DTA\Strategy(subset="{{internal.parameterLocation}}", name="DateTime") + * @DTA\Validator(subset="{{internal.parameterLocation}}", name="Date", options={"format": \DateTime::RFC3339}) +{{/isDateTime +}}{{^isPrimitiveType +}}{{^isDate}}{{^isDateTime +}} * TODO add validator(s) and strategy for {{dataType}} inside query string +{{/isDateTime}}{{/isDate +}}{{/isPrimitiveType +}}{{/isContainer +}}{{#hasValidation +}}{{#minLength}}{{#maxLength +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="StringLength", options={"min":{{minLength}}, "max":{{maxLength}}}) +{{/maxLength}}{{/minLength +}}{{^minLength}}{{#maxLength +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="StringLength", options={"max":{{maxLength}}}) +{{/maxLength}}{{/minLength +}}{{#minLength}}{{^maxLength +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="StringLength", options={"min":{{minLength}}}) +{{/maxLength}}{{/minLength +}}{{#minimum +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="GreaterThan", options={"min":{{minimum}}{{^exclusiveMinimum}}, "inclusive":true{{/exclusiveMinimum}}}) +{{/minimum +}}{{#maximum +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="LessThan", options={"max":{{maximum}}{{^exclusiveMaximum}}, "inclusive":true{{/exclusiveMaximum}}}) +{{/maximum +}}{{#pattern +}} * @DTA\Validator(subset="{{internal.parameterLocation}}", name="Regex", options={"pattern":"{{{pattern}}}"}) +{{/pattern +}}{{/hasValidation}} \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/.gitignore b/samples/client/petstore/php-dt-modern/.gitignore new file mode 100644 index 00000000000..f674bbd2d1f --- /dev/null +++ b/samples/client/petstore/php-dt-modern/.gitignore @@ -0,0 +1,6 @@ +#based on .gitignore generated by https://github.com/zendframework/zend-expressive-skeleton +.idea + +# Composer files +composer.phar +vendor/ diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator-ignore b/samples/client/petstore/php-dt-modern/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator/FILES b/samples/client/petstore/php-dt-modern/.openapi-generator/FILES new file mode 100644 index 00000000000..b1c5f88c6f8 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/.openapi-generator/FILES @@ -0,0 +1,62 @@ +.gitignore +README.md +composer.json +src/App/ApiClient.php +src/App/ApiClientFactory.php +src/App/DTO/ApiResponse.php +src/App/DTO/Category.php +src/App/DTO/Collection.php +src/App/DTO/Collection1.php +src/App/DTO/Collection10.php +src/App/DTO/Collection11.php +src/App/DTO/Collection12.php +src/App/DTO/Collection13.php +src/App/DTO/Collection14.php +src/App/DTO/Collection15.php +src/App/DTO/Collection16.php +src/App/DTO/Collection17.php +src/App/DTO/Collection18.php +src/App/DTO/Collection19.php +src/App/DTO/Collection2.php +src/App/DTO/Collection20.php +src/App/DTO/Collection21.php +src/App/DTO/Collection22.php +src/App/DTO/Collection23.php +src/App/DTO/Collection24.php +src/App/DTO/Collection25.php +src/App/DTO/Collection26.php +src/App/DTO/Collection27.php +src/App/DTO/Collection28.php +src/App/DTO/Collection29.php +src/App/DTO/Collection3.php +src/App/DTO/Collection30.php +src/App/DTO/Collection31.php +src/App/DTO/Collection32.php +src/App/DTO/Collection33.php +src/App/DTO/Collection34.php +src/App/DTO/Collection35.php +src/App/DTO/Collection36.php +src/App/DTO/Collection4.php +src/App/DTO/Collection5.php +src/App/DTO/Collection6.php +src/App/DTO/Collection7.php +src/App/DTO/Collection8.php +src/App/DTO/Collection9.php +src/App/DTO/DeleteOrderParameterData.php +src/App/DTO/DeletePetParameterData.php +src/App/DTO/DeleteUserParameterData.php +src/App/DTO/FindPetsByStatusParameterData.php +src/App/DTO/FindPetsByTagsParameterData.php +src/App/DTO/GetOrderByIdParameterData.php +src/App/DTO/GetPetByIdParameterData.php +src/App/DTO/GetUserByNameParameterData.php +src/App/DTO/InlineObject.php +src/App/DTO/InlineObject1.php +src/App/DTO/LoginUserParameterData.php +src/App/DTO/Order.php +src/App/DTO/Pet.php +src/App/DTO/Tag.php +src/App/DTO/UpdatePetWithFormParameterData.php +src/App/DTO/UpdateUserParameterData.php +src/App/DTO/UploadFileParameterData.php +src/App/DTO/User.php diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/README.md b/samples/client/petstore/php-dt-modern/README.md new file mode 100644 index 00000000000..fbe290e8adc --- /dev/null +++ b/samples/client/petstore/php-dt-modern/README.md @@ -0,0 +1,135 @@ +# Client library for OpenAPI Petstore + +Generated by the [OpenAPI Generator](https://openapi-generator.tech) project. + +## Overview +This lightweight extensible client library is [PSR-7](https://www.php-fig.org/psr/psr-7), [PSR-11](https://www.php-fig.org/psr/psr-11), [PSR-17](https://www.php-fig.org/psr/psr-17) and [PSR-18](https://www.php-fig.org/psr/psr-18) complaint and relies on: + +- PHP: >=8.0 +- [Data Transfer](https://github.com/Articus/DataTransfer): >=0.5 + + +## How to use + +This library can be used either as a separate package (just deploy generated files to your package repository and add dependency `"git_user_id/git_repo_id":"1.0.0"` to your project `composer.json`) or as a part of your project (just copy generated code from `src` and merge generated `composer.json` into your project `composer.json`). + +First you need an implementation for [PSR-7](https://packagist.org/packages/psr/http-message) and [PSR-17](https://packagist.org/packages/psr/http-factory) interfaces. Usually it is a single package, and your project might already have one among its dependencies (for example if it is some web service). Otherwise, https://packagist.org/providers/psr/http-message-implementation and https://packagist.org/providers/psr/http-factory-implementation may help to find some suitable options. + +Next choose an implementation for [PSR-18 interfaces](https://packagist.org/packages/psr/http-client). https://packagist.org/providers/psr/http-client-implementation may help to find some suitable options. + +Then check content types for API requests you intend to send and API responses you intend to receive. For each unique content type you will need an implementation of [`OpenAPIGenerator\APIClient\BodyCoderInterface`](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoderInterface.php) to encode request bodies and decode response bodies. Currently, only [`application/json` body coder](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoder/Json.php) is provided out-of-the-box. + +After that review security requirements for API operations you intend to use. For each unique security scheme you will need an implementation of [OpenAPIGenerator\APIClient\SecurityProviderInterface](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProviderInterface.php). Currently, only [HTTP Bearer authentication](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProvider/HttpBearer.php) is supported out-of-the-box. + +The last step is to configure and wire all services together. It is highly advisable to use [PSR-11 container](https://packagist.org/packages/psr/container) for that. If you have not selected one for your project yet, https://packagist.org/providers/psr/container-implementation may help to find some suitable options. Here is a sample wiring configuration for `"laminas/laminas-servicemanager"`, `"laminas/laminas-diactoros"` and `"symfony/http-client"` (consult generated `composer.json` for the exact versions of used packages): + +```PHP + [ + Psr\Http\Message\RequestFactoryInterface::class => Laminas\Diactoros\RequestFactory::class, + Psr\Http\Message\ResponseFactoryInterface::class => Laminas\Diactoros\ResponseFactory::class, + Psr\Http\Message\StreamFactoryInterface::class => Laminas\Diactoros\StreamFactory::class, + ], + 'factories' => [ + App\ApiClient::class => App\ApiClientFactory::class, + + Articus\DataTransfer\Service::class => Articus\DataTransfer\Factory::class, + Articus\DataTransfer\MetadataProvider\PhpAttribute::class => Articus\DataTransfer\MetadataProvider\Factory\PhpAttribute::class, + Articus\DataTransfer\Strategy\PluginManager::class => Articus\DataTransfer\Strategy\Factory\PluginManager::class, + Articus\DataTransfer\Validator\PluginManager::class => Articus\DataTransfer\Validator\Factory\PluginManager::class, + Laminas\Validator\ValidatorPluginManager::class => Laminas\Validator\ValidatorPluginManagerFactory::class, + + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => OpenAPIGenerator\APIClient\SecurityProvider\Factory\PluginManager::class, + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => OpenAPIGenerator\APIClient\BodyCoder\Factory\PluginManager::class, + + Psr\Http\Client\ClientInterface::class => function (Psr\Container\ContainerInterface $container) + { + return new Symfony\Component\HttpClient\Psr18Client( + new Symfony\Component\HttpClient\NativeHttpClient(), + $container->get(Psr\Http\Message\ResponseFactoryInterface::class), + $container->get(Psr\Http\Message\StreamFactoryInterface::class) + ); + }, + ], + 'aliases' => [ + Articus\DataTransfer\ClassMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\PhpAttribute::class, + Articus\DataTransfer\FieldMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\PhpAttribute::class, + ], +]; +$config = [ + 'dependencies' => $dependencies, + + //Configure DataTransfer library + Articus\DataTransfer\Strategy\PluginManager::class => [ + 'invokables' => [ + 'QueryStringScalar' => OpenAPIGenerator\Common\Strategy\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Strategy\QueryStringScalarArray::class, + ], + 'factories' => [ + 'Date' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDate::class, + 'DateTime' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDateTime::class, + 'ObjectList' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectList::class, + 'ObjectMap' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectMap::class, + 'ScalarList' => OpenAPIGenerator\Common\Strategy\Factory\ScalarList::class, + 'ScalarMap' => OpenAPIGenerator\Common\Strategy\Factory\ScalarMap::class, + ] + ], + Articus\DataTransfer\Validator\PluginManager::class => [ + 'invokables' => [ + 'Scalar' => OpenAPIGenerator\Common\Validator\Scalar::class, + 'QueryStringScalar' => OpenAPIGenerator\Common\Validator\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Validator\QueryStringScalarArray::class, + ], + 'abstract_factories' => [ + Articus\DataTransfer\Validator\Factory\Laminas::class, + ], + ], + 'validators' => [ + 'invokables' => [ + 'Count' => Laminas\Validator\IsCountable::class, + ], + ], + + //Set API server URL here + App\ApiClient::class => [ + //'server_url' => 'https://api.url', + ], + + //Register body coders for used content types here + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => [ + 'factories' => [ + //'another/mime-type' => AnotherMimeTypeBodyCoder::class + ], + ], + + //Register security providers for used security schemes here + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => [ + 'factories' => [ + //'another-security-scheme' => AnotherSecuritySchemeProvider::class, + ], + 'aliases' => [ + //'custom-name-for-htt-bearer' => OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class, + ], + ], +]; +$container = new Laminas\ServiceManager\ServiceManager($dependencies); +$container->setService('config', $config); +$container->setAlias('Config', 'config'); + +/** @var App\ApiClient $client */ +$client = $container->get(App\ApiClient::class); +//... and now you can use client methods to call API operations :) + +//And one more sample: how to set token for HTTP Bearer authentication +/** @var OpenAPIGenerator\APIClient\SecurityProvider\PluginManager $securityProviders */ +$securityProviders = $container->get(OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class); +/** @var OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer $httpBearer */ +$httpBearer = $securityProviders->get(OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class); +$httpBearer->setToken('some-token'); + +``` diff --git a/samples/client/petstore/php-dt-modern/composer.json b/samples/client/petstore/php-dt-modern/composer.json new file mode 100644 index 00000000000..b039e9df0c1 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/composer.json @@ -0,0 +1,26 @@ +{ + "name": "git_user_id/git_repo_id", + "description": "", + "license": "unlicense", + "version": "1.0.0", + "type": "library", + "require": { + "php": "^8.0", + "articus/data-transfer": "^0.5", + "articus/openapi-generator-common": "^0.2", + "articus/openapi-generator-apiclient": "^0.1", + "psr/simple-cache": "^1.0", + "laminas/laminas-stdlib": "^3.2", + "laminas/laminas-validator": "^2.13" + }, + "autoload": { + "psr-4": { + "": "src/" + } + }, + "require-dev": { + "laminas/laminas-servicemanager": "^3.6", + "laminas/laminas-diactoros": "^2.6", + "symfony/http-client": "^5.3" + } +} \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/src/App/ApiClient.php b/samples/client/petstore/php-dt-modern/src/App/ApiClient.php new file mode 100644 index 00000000000..b4e56f6f9da --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/ApiClient.php @@ -0,0 +1,1471 @@ + ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Add a new pet to the store + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function addPet( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->addPetRaw($requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 405: + /* Invalid input */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Add a new pet to the store + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function addPetResult( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->addPet($requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion + + //region createUser + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUserRaw( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUser( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUserRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUserResult( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): mixed + { + return $this->getSuccessfulContent(...$this->createUser($requestContent, $security, $requestMediaType)); + } + //endregion + + //region createUsersWithArrayInput + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUsersWithArrayInputRaw( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user/createWithArray', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUsersWithArrayInput( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUsersWithArrayInputRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUsersWithArrayInputResult( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): mixed + { + return $this->getSuccessfulContent(...$this->createUsersWithArrayInput($requestContent, $security, $requestMediaType)); + } + //endregion + + //region createUsersWithListInput + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUsersWithListInputRaw( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user/createWithList', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUsersWithListInput( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUsersWithListInputRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUsersWithListInputResult( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): mixed + { + return $this->getSuccessfulContent(...$this->createUsersWithListInput($requestContent, $security, $requestMediaType)); + } + //endregion + + //region deleteOrder + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deleteOrderRaw( + \App\DTO\DeleteOrderParameterData $parameters + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/store/order/{orderId}', $this->getPathParameters($parameters), []); + return $this->httpClient->sendRequest($request); + } + + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deleteOrder( + \App\DTO\DeleteOrderParameterData $parameters + ): array + { + $response = $this->deleteOrderRaw($parameters); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Order not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deleteOrderResult( + \App\DTO\DeleteOrderParameterData $parameters + ): mixed + { + return $this->getSuccessfulContent(...$this->deleteOrder($parameters)); + } + //endregion + + //region deletePet + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deletePetRaw( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addCustomHeaders($request, $parameters); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deletePet( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ): array + { + $response = $this->deletePetRaw($parameters, $security); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid pet value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deletePetResult( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ): mixed + { + return $this->getSuccessfulContent(...$this->deletePet($parameters, $security)); + } + //endregion + + //region deleteUser + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deleteUserRaw( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deleteUser( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ): array + { + $response = $this->deleteUserRaw($parameters, $security); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid username supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deleteUserResult( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ): mixed + { + return $this->getSuccessfulContent(...$this->deleteUser($parameters, $security)); + } + //endregion + + //region findPetsByStatus + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function findPetsByStatusRaw( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/findByStatus', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function findPetsByStatus( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->findPetsByStatusRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection19(); + break; + case 400: + /* Invalid status value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection19 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function findPetsByStatusResult( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): \App\DTO\Collection19 + { + return $this->getSuccessfulContent(...$this->findPetsByStatus($parameters, $security, $responseMediaType)); + } + //endregion + + //region findPetsByTags + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function findPetsByTagsRaw( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/findByTags', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function findPetsByTags( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->findPetsByTagsRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection26(); + break; + case 400: + /* Invalid tag value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection26 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function findPetsByTagsResult( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): \App\DTO\Collection26 + { + return $this->getSuccessfulContent(...$this->findPetsByTags($parameters, $security, $responseMediaType)); + } + //endregion + + //region getInventory + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getInventoryRaw( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/store/inventory', [], []); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getInventory( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): array + { + $response = $this->getInventoryRaw($security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection34(); + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection34 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getInventoryResult( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): \App\DTO\Collection34 + { + return $this->getSuccessfulContent(...$this->getInventory($security, $responseMediaType)); + } + //endregion + + //region getOrderById + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getOrderByIdRaw( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/store/order/{orderId}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getOrderById( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getOrderByIdRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Order(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Order not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return \App\DTO\Order + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getOrderByIdResult( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): \App\DTO\Order + { + return $this->getSuccessfulContent(...$this->getOrderById($parameters, $responseMediaType)); + } + //endregion + + //region getPetById + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getPetByIdRaw( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getPetById( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getPetByIdRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Pet not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getPetByIdResult( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->getPetById($parameters, $security, $responseMediaType)); + } + //endregion + + //region getUserByName + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getUserByNameRaw( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getUserByName( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getUserByNameRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\User(); + break; + case 400: + /* Invalid username supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return \App\DTO\User + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getUserByNameResult( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): \App\DTO\User + { + return $this->getSuccessfulContent(...$this->getUserByName($parameters, $responseMediaType)); + } + //endregion + + //region loginUser + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function loginUserRaw( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/login', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function loginUser( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->loginUserRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + break; + case 400: + /* Invalid username/password supplied */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return string + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function loginUserResult( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): string + { + return $this->getSuccessfulContent(...$this->loginUser($parameters, $responseMediaType)); + } + //endregion + + //region logoutUser + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function logoutUserRaw( + iterable $security = ['api_key' => []] + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/logout', [], []); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function logoutUser( + iterable $security = ['api_key' => []] + ): array + { + $response = $this->logoutUserRaw($security); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function logoutUserResult( + iterable $security = ['api_key' => []] + ): mixed + { + return $this->getSuccessfulContent(...$this->logoutUser($security)); + } + //endregion + + //region placeOrder + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function placeOrderRaw( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/store/order', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function placeOrder( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->placeOrderRaw($requestContent, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Order(); + break; + case 400: + /* Invalid Order */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Order + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function placeOrderResult( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Order + { + return $this->getSuccessfulContent(...$this->placeOrder($requestContent, $requestMediaType, $responseMediaType)); + } + //endregion + + //region updatePet + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updatePetRaw( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('PUT', '/pet', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updatePet( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->updatePetRaw($requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Pet not found */ + break; + case 405: + /* Validation exception */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updatePetResult( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->updatePet($requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion + + //region updatePetWithForm + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updatePetWithFormRaw( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updatePetWithForm( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ): array + { + $response = $this->updatePetWithFormRaw($parameters, $requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 405: + /* Invalid input */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updatePetWithFormResult( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ): mixed + { + return $this->getSuccessfulContent(...$this->updatePetWithForm($parameters, $requestContent, $security, $requestMediaType)); + } + //endregion + + //region updateUser + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updateUserRaw( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('PUT', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updateUser( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->updateUserRaw($parameters, $requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid user supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updateUserResult( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): mixed + { + return $this->getSuccessfulContent(...$this->updateUser($parameters, $requestContent, $security, $requestMediaType)); + } + //endregion + + //region uploadFile + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function uploadFileRaw( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet/{petId}/uploadImage', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function uploadFile( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): array + { + $response = $this->uploadFileRaw($parameters, $requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\ApiResponse(); + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\ApiResponse + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function uploadFileResult( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): \App\DTO\ApiResponse + { + return $this->getSuccessfulContent(...$this->uploadFile($parameters, $requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion +} + diff --git a/samples/client/petstore/php-dt-modern/src/App/ApiClientFactory.php b/samples/client/petstore/php-dt-modern/src/App/ApiClientFactory.php new file mode 100644 index 00000000000..3a1725e7b12 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/ApiClientFactory.php @@ -0,0 +1,30 @@ +getServiceConfig($container), $options ?? [])); + return new ApiClient( + $config->serverUrl, + $container->get($config->dataTransferServiceName), + $container->get($config->requestFactoryServiceName), + $container->get($config->httpClientServiceName), + $container->get($config->securityProviderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName) + ); + } +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/ApiResponse.php b/samples/client/petstore/php-dt-modern/src/App/DTO/ApiResponse.php new file mode 100644 index 00000000000..bfe65906ea5 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/ApiResponse.php @@ -0,0 +1,25 @@ + "int"])] + public int|null $code = null; + + #[DTA\Data(field: "type", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $type = null; + + #[DTA\Data(field: "message", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $message = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Category.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Category.php new file mode 100644 index 00000000000..e6b28c29028 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Category.php @@ -0,0 +1,22 @@ + "int"])] + public int|null $id = null; + + #[DTA\Data(field: "name", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + #[DTA\Validator("Regex", ["pattern" => "/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/"])] + public string|null $name = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection.php new file mode 100644 index 00000000000..f0e14da6cd8 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection1.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection1.php new file mode 100644 index 00000000000..c05da2858bd --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection1.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection1 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection10.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection10.php new file mode 100644 index 00000000000..29e6ccdb347 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection10.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection10 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection11.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection11.php new file mode 100644 index 00000000000..89b2d0d01f8 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection11.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection11 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection12.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection12.php new file mode 100644 index 00000000000..e0657b0d467 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection12.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection12 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection13.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection13.php new file mode 100644 index 00000000000..26f88d9685d --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection13.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection13 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection14.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection14.php new file mode 100644 index 00000000000..d1e0e11495b --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection14.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection14 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection15.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection15.php new file mode 100644 index 00000000000..085f17e1e97 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection15.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection15 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection16.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection16.php new file mode 100644 index 00000000000..1b1523c7d09 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection16.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection16 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection17.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection17.php new file mode 100644 index 00000000000..eb5b0e828f8 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection17.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection17 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection18.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection18.php new file mode 100644 index 00000000000..dd55bd5840a --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection18.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection18 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection19.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection19.php new file mode 100644 index 00000000000..45da36c7301 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection19.php @@ -0,0 +1,14 @@ + \App\DTO\Pet::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Pet::class]] +]])] +class Collection19 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection2.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection2.php new file mode 100644 index 00000000000..26176dcc5e5 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection2.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection2 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection20.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection20.php new file mode 100644 index 00000000000..26b16ef104e --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection20.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection20 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection21.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection21.php new file mode 100644 index 00000000000..9e0c2429bde --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection21.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection21 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection22.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection22.php new file mode 100644 index 00000000000..6f7a04ff4bd --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection22.php @@ -0,0 +1,14 @@ + \App\DTO\Pet::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Pet::class]] +]])] +class Collection22 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection23.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection23.php new file mode 100644 index 00000000000..608c9ad5020 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection23.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection23 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection24.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection24.php new file mode 100644 index 00000000000..b876816c2dd --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection24.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection24 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection25.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection25.php new file mode 100644 index 00000000000..ad3a8102ad3 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection25.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection25 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection26.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection26.php new file mode 100644 index 00000000000..f8e958fcb40 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection26.php @@ -0,0 +1,14 @@ + \App\DTO\Pet::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Pet::class]] +]])] +class Collection26 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection27.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection27.php new file mode 100644 index 00000000000..b53e9e87a72 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection27.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection27 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection28.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection28.php new file mode 100644 index 00000000000..3b6e05419ef --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection28.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection28 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection29.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection29.php new file mode 100644 index 00000000000..24a1ee261d8 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection29.php @@ -0,0 +1,14 @@ + \App\DTO\Pet::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Pet::class]] +]])] +class Collection29 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection3.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection3.php new file mode 100644 index 00000000000..1833307cd7e --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection3.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection3 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection30.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection30.php new file mode 100644 index 00000000000..916229afc92 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection30.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection30 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection31.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection31.php new file mode 100644 index 00000000000..12b771c1c16 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection31.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection31 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection32.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection32.php new file mode 100644 index 00000000000..e89cbcd4397 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection32.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection32 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection33.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection33.php new file mode 100644 index 00000000000..91229b175cf --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection33.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection33 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection34.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection34.php new file mode 100644 index 00000000000..1670c4ee7e3 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection34.php @@ -0,0 +1,14 @@ + "int"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "int"]] +]])] +class Collection34 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection35.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection35.php new file mode 100644 index 00000000000..4b1082abc1b --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection35.php @@ -0,0 +1,14 @@ + \App\DTO\User::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\User::class]] +]])] +class Collection35 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection36.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection36.php new file mode 100644 index 00000000000..38595c2f5d3 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection36.php @@ -0,0 +1,14 @@ + \App\DTO\User::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\User::class]] +]])] +class Collection36 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection4.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection4.php new file mode 100644 index 00000000000..54e2f1a12de --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection4.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection4 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection5.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection5.php new file mode 100644 index 00000000000..3f32f4513a7 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection5.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection5 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection6.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection6.php new file mode 100644 index 00000000000..79abc43f339 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection6.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection6 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection7.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection7.php new file mode 100644 index 00000000000..8574d82b365 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection7.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection7 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection8.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection8.php new file mode 100644 index 00000000000..c264d8076a1 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection8.php @@ -0,0 +1,14 @@ + "string"])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "Scalar", "options" => ["type" => "string"]] +]])] +class Collection8 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Collection9.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection9.php new file mode 100644 index 00000000000..99cc837d6a5 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Collection9.php @@ -0,0 +1,14 @@ + \App\DTO\Tag::class])] +#[DTA\Validator("Collection", ["validators" => [ + ["name" => "TypeCompliant", "options" => ["type" => \App\DTO\Tag::class]] +]])] +class Collection9 extends \ArrayObject +{ +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteOrderParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteOrderParameterData.php new file mode 100644 index 00000000000..994c6365c4a --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteOrderParameterData.php @@ -0,0 +1,21 @@ + "string"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "path")] + public string|null $order_id = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/DeletePetParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/DeletePetParameterData.php new file mode 100644 index 00000000000..147a15a512e --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/DeletePetParameterData.php @@ -0,0 +1,26 @@ + "int"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "int"], subset: "path")] + public int|null $pet_id = null; + + #[DTA\Data(subset: "header", field: "api_key", nullable: true)] + #[DTA\Strategy("QueryStringScalar", ["type" => "string"], "header")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "header")] + public string|null $api_key = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteUserParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteUserParameterData.php new file mode 100644 index 00000000000..1d3caf3bb21 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/DeleteUserParameterData.php @@ -0,0 +1,21 @@ + "string"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "path")] + public string|null $username = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByStatusParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByStatusParameterData.php new file mode 100644 index 00000000000..857a59ed71a --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByStatusParameterData.php @@ -0,0 +1,21 @@ + "string", "format" => "csv"], "query")] + #[DTA\Validator("QueryStringScalarArray", ["type" => "string", "format" => "csv"], subset: "query")] + public array|null $status = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByTagsParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByTagsParameterData.php new file mode 100644 index 00000000000..7a8f0690b90 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/FindPetsByTagsParameterData.php @@ -0,0 +1,21 @@ + "string", "format" => "csv"], "query")] + #[DTA\Validator("QueryStringScalarArray", ["type" => "string", "format" => "csv"], subset: "query")] + public array|null $tags = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/GetOrderByIdParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/GetOrderByIdParameterData.php new file mode 100644 index 00000000000..e31c2dbb212 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/GetOrderByIdParameterData.php @@ -0,0 +1,23 @@ + "int"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "int"], subset: "path")] + #[DTA\Validator("GreaterThan", ["min" => 1, "inclusive" => true], subset: "path")] + #[DTA\Validator("LessThan", ["max" => 5, "inclusive" => true], subset: "path")] + public int|null $order_id = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/GetPetByIdParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/GetPetByIdParameterData.php new file mode 100644 index 00000000000..65921282d40 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/GetPetByIdParameterData.php @@ -0,0 +1,21 @@ + "int"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "int"], subset: "path")] + public int|null $pet_id = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/GetUserByNameParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/GetUserByNameParameterData.php new file mode 100644 index 00000000000..b65b1d75e2c --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/GetUserByNameParameterData.php @@ -0,0 +1,21 @@ + "string"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "path")] + public string|null $username = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject.php b/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject.php new file mode 100644 index 00000000000..f3cbbf36aea --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject.php @@ -0,0 +1,24 @@ + "string"])] + public string|null $name = null; + + /** + * Updated status of the pet + */ + #[DTA\Data(field: "status", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $status = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject1.php b/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject1.php new file mode 100644 index 00000000000..791f4cf410b --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/InlineObject1.php @@ -0,0 +1,25 @@ + "string"])] + public string|null $additional_metadata = null; + + /** + * file to upload + */ + #[DTA\Data(field: "file", nullable: true)] + #[DTA\Strategy("Object", ["type" => \SplFileObject::class])] + #[DTA\Validator("TypeCompliant", ["type" => \SplFileObject::class])] + public \SplFileObject|null $file = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/LoginUserParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/LoginUserParameterData.php new file mode 100644 index 00000000000..508d53f57ad --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/LoginUserParameterData.php @@ -0,0 +1,30 @@ + "string"], "query")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "query")] + public string|null $password = null; + + /** + * The user name for login + */ + #[DTA\Data(subset: "query", field: "username")] + #[DTA\Strategy("QueryStringScalar", ["type" => "string"], "query")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "query")] + #[DTA\Validator("Regex", ["pattern" => "/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/"], subset: "query")] + public string|null $username = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Order.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Order.php new file mode 100644 index 00000000000..8dd384b4475 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Order.php @@ -0,0 +1,41 @@ + "int"])] + public int|null $id = null; + + #[DTA\Data(field: "petId", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "int"])] + public int|null $pet_id = null; + + #[DTA\Data(field: "quantity", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "int"])] + public int|null $quantity = null; + + #[DTA\Data(field: "shipDate", nullable: true)] + #[DTA\Strategy("DateTime")] + #[DTA\Validator("Date", ["format" => \DateTime::RFC3339])] + public \DateTime|null $ship_date = null; + + /** + * Order Status + */ + #[DTA\Data(field: "status", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $status = null; + + #[DTA\Data(field: "complete", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "bool"])] + public bool|null $complete = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Pet.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Pet.php new file mode 100644 index 00000000000..bcd5cdb6e81 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Pet.php @@ -0,0 +1,43 @@ + "int"])] + public int|null $id = null; + + #[DTA\Data(field: "category", nullable: true)] + #[DTA\Strategy("Object", ["type" => \App\DTO\Category::class])] + #[DTA\Validator("TypeCompliant", ["type" => \App\DTO\Category::class])] + public \App\DTO\Category|null $category = null; + + #[DTA\Data(field: "name")] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $name = null; + + #[DTA\Data(field: "photoUrls")] + #[DTA\Strategy("Object", ["type" => \App\DTO\Collection32::class])] + #[DTA\Validator("TypeCompliant", ["type" => \App\DTO\Collection32::class])] + public \App\DTO\Collection32|null $photo_urls = null; + + #[DTA\Data(field: "tags", nullable: true)] + #[DTA\Strategy("Object", ["type" => \App\DTO\Collection33::class])] + #[DTA\Validator("TypeCompliant", ["type" => \App\DTO\Collection33::class])] + public \App\DTO\Collection33|null $tags = null; + + /** + * pet status in the store + */ + #[DTA\Data(field: "status", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $status = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/Tag.php b/samples/client/petstore/php-dt-modern/src/App/DTO/Tag.php new file mode 100644 index 00000000000..5fcc6c116b0 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/Tag.php @@ -0,0 +1,21 @@ + "int"])] + public int|null $id = null; + + #[DTA\Data(field: "name", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $name = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/UpdatePetWithFormParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/UpdatePetWithFormParameterData.php new file mode 100644 index 00000000000..24849452e92 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/UpdatePetWithFormParameterData.php @@ -0,0 +1,21 @@ + "int"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "int"], subset: "path")] + public int|null $pet_id = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/UpdateUserParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/UpdateUserParameterData.php new file mode 100644 index 00000000000..eaf64f9d724 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/UpdateUserParameterData.php @@ -0,0 +1,21 @@ + "string"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "string"], subset: "path")] + public string|null $username = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/UploadFileParameterData.php b/samples/client/petstore/php-dt-modern/src/App/DTO/UploadFileParameterData.php new file mode 100644 index 00000000000..af2bdc4c905 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/UploadFileParameterData.php @@ -0,0 +1,21 @@ + "int"], "path")] + #[DTA\Validator("QueryStringScalar", ["type" => "int"], subset: "path")] + public int|null $pet_id = null; + +} diff --git a/samples/client/petstore/php-dt-modern/src/App/DTO/User.php b/samples/client/petstore/php-dt-modern/src/App/DTO/User.php new file mode 100644 index 00000000000..c257dfea319 --- /dev/null +++ b/samples/client/petstore/php-dt-modern/src/App/DTO/User.php @@ -0,0 +1,48 @@ + "int"])] + public int|null $id = null; + + #[DTA\Data(field: "username", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $username = null; + + #[DTA\Data(field: "firstName", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $first_name = null; + + #[DTA\Data(field: "lastName", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $last_name = null; + + #[DTA\Data(field: "email", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $email = null; + + #[DTA\Data(field: "password", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $password = null; + + #[DTA\Data(field: "phone", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "string"])] + public string|null $phone = null; + + /** + * User Status + */ + #[DTA\Data(field: "userStatus", nullable: true)] + #[DTA\Validator("Scalar", ["type" => "int"])] + public int|null $user_status = null; + +} diff --git a/samples/client/petstore/php-dt/.gitignore b/samples/client/petstore/php-dt/.gitignore new file mode 100644 index 00000000000..f674bbd2d1f --- /dev/null +++ b/samples/client/petstore/php-dt/.gitignore @@ -0,0 +1,6 @@ +#based on .gitignore generated by https://github.com/zendframework/zend-expressive-skeleton +.idea + +# Composer files +composer.phar +vendor/ diff --git a/samples/client/petstore/php-dt/.openapi-generator-ignore b/samples/client/petstore/php-dt/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/php-dt/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/php-dt/.openapi-generator/FILES b/samples/client/petstore/php-dt/.openapi-generator/FILES new file mode 100644 index 00000000000..b1c5f88c6f8 --- /dev/null +++ b/samples/client/petstore/php-dt/.openapi-generator/FILES @@ -0,0 +1,62 @@ +.gitignore +README.md +composer.json +src/App/ApiClient.php +src/App/ApiClientFactory.php +src/App/DTO/ApiResponse.php +src/App/DTO/Category.php +src/App/DTO/Collection.php +src/App/DTO/Collection1.php +src/App/DTO/Collection10.php +src/App/DTO/Collection11.php +src/App/DTO/Collection12.php +src/App/DTO/Collection13.php +src/App/DTO/Collection14.php +src/App/DTO/Collection15.php +src/App/DTO/Collection16.php +src/App/DTO/Collection17.php +src/App/DTO/Collection18.php +src/App/DTO/Collection19.php +src/App/DTO/Collection2.php +src/App/DTO/Collection20.php +src/App/DTO/Collection21.php +src/App/DTO/Collection22.php +src/App/DTO/Collection23.php +src/App/DTO/Collection24.php +src/App/DTO/Collection25.php +src/App/DTO/Collection26.php +src/App/DTO/Collection27.php +src/App/DTO/Collection28.php +src/App/DTO/Collection29.php +src/App/DTO/Collection3.php +src/App/DTO/Collection30.php +src/App/DTO/Collection31.php +src/App/DTO/Collection32.php +src/App/DTO/Collection33.php +src/App/DTO/Collection34.php +src/App/DTO/Collection35.php +src/App/DTO/Collection36.php +src/App/DTO/Collection4.php +src/App/DTO/Collection5.php +src/App/DTO/Collection6.php +src/App/DTO/Collection7.php +src/App/DTO/Collection8.php +src/App/DTO/Collection9.php +src/App/DTO/DeleteOrderParameterData.php +src/App/DTO/DeletePetParameterData.php +src/App/DTO/DeleteUserParameterData.php +src/App/DTO/FindPetsByStatusParameterData.php +src/App/DTO/FindPetsByTagsParameterData.php +src/App/DTO/GetOrderByIdParameterData.php +src/App/DTO/GetPetByIdParameterData.php +src/App/DTO/GetUserByNameParameterData.php +src/App/DTO/InlineObject.php +src/App/DTO/InlineObject1.php +src/App/DTO/LoginUserParameterData.php +src/App/DTO/Order.php +src/App/DTO/Pet.php +src/App/DTO/Tag.php +src/App/DTO/UpdatePetWithFormParameterData.php +src/App/DTO/UpdateUserParameterData.php +src/App/DTO/UploadFileParameterData.php +src/App/DTO/User.php diff --git a/samples/client/petstore/php-dt/.openapi-generator/VERSION b/samples/client/petstore/php-dt/.openapi-generator/VERSION new file mode 100644 index 00000000000..862529f8cac --- /dev/null +++ b/samples/client/petstore/php-dt/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php-dt/README.md b/samples/client/petstore/php-dt/README.md new file mode 100644 index 00000000000..62fd55096c2 --- /dev/null +++ b/samples/client/petstore/php-dt/README.md @@ -0,0 +1,135 @@ +# Client library for OpenAPI Petstore + +Generated by the [OpenAPI Generator](https://openapi-generator.tech) project. + +## Overview +This lightweight extensible client library is [PSR-7](https://www.php-fig.org/psr/psr-7), [PSR-11](https://www.php-fig.org/psr/psr-11), [PSR-17](https://www.php-fig.org/psr/psr-17) and [PSR-18](https://www.php-fig.org/psr/psr-18) complaint and relies on: + +- PHP: >=7.3 +- [Data Transfer](https://github.com/Articus/DataTransfer): >=0.5 + + +## How to use + +This library can be used either as a separate package (just deploy generated files to your package repository and add dependency `"git_user_id/git_repo_id":"1.0.0"` to your project `composer.json`) or as a part of your project (just copy generated code from `src` and merge generated `composer.json` into your project `composer.json`). + +First you need an implementation for [PSR-7](https://packagist.org/packages/psr/http-message) and [PSR-17](https://packagist.org/packages/psr/http-factory) interfaces. Usually it is a single package, and your project might already have one among its dependencies (for example if it is some web service). Otherwise, https://packagist.org/providers/psr/http-message-implementation and https://packagist.org/providers/psr/http-factory-implementation may help to find some suitable options. + +Next choose an implementation for [PSR-18 interfaces](https://packagist.org/packages/psr/http-client). https://packagist.org/providers/psr/http-client-implementation may help to find some suitable options. + +Then check content types for API requests you intend to send and API responses you intend to receive. For each unique content type you will need an implementation of [`OpenAPIGenerator\APIClient\BodyCoderInterface`](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoderInterface.php) to encode request bodies and decode response bodies. Currently, only [`application/json` body coder](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/BodyCoder/Json.php) is provided out-of-the-box. + +After that review security requirements for API operations you intend to use. For each unique security scheme you will need an implementation of [OpenAPIGenerator\APIClient\SecurityProviderInterface](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProviderInterface.php). Currently, only [HTTP Bearer authentication](https://github.com/Articus/OpenAPIGeneratorAPIClient-PHP/blob/master/src/OpenAPIGenerator/APIClient/SecurityProvider/HttpBearer.php) is supported out-of-the-box. + +The last step is to configure and wire all services together. It is highly advisable to use [PSR-11 container](https://packagist.org/packages/psr/container) for that. If you have not selected one for your project yet, https://packagist.org/providers/psr/container-implementation may help to find some suitable options. Here is a sample wiring configuration for `"laminas/laminas-servicemanager"`, `"laminas/laminas-diactoros"` and `"symfony/http-client"` (consult generated `composer.json` for the exact versions of used packages): + +```PHP + [ + Psr\Http\Message\RequestFactoryInterface::class => Laminas\Diactoros\RequestFactory::class, + Psr\Http\Message\ResponseFactoryInterface::class => Laminas\Diactoros\ResponseFactory::class, + Psr\Http\Message\StreamFactoryInterface::class => Laminas\Diactoros\StreamFactory::class, + ], + 'factories' => [ + App\ApiClient::class => App\ApiClientFactory::class, + + Articus\DataTransfer\Service::class => Articus\DataTransfer\Factory::class, + Articus\DataTransfer\MetadataProvider\Annotation::class => Articus\DataTransfer\MetadataProvider\Factory\Annotation::class, + Articus\DataTransfer\Strategy\PluginManager::class => Articus\DataTransfer\Strategy\Factory\PluginManager::class, + Articus\DataTransfer\Validator\PluginManager::class => Articus\DataTransfer\Validator\Factory\PluginManager::class, + Laminas\Validator\ValidatorPluginManager::class => Laminas\Validator\ValidatorPluginManagerFactory::class, + + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => OpenAPIGenerator\APIClient\SecurityProvider\Factory\PluginManager::class, + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => OpenAPIGenerator\APIClient\BodyCoder\Factory\PluginManager::class, + + Psr\Http\Client\ClientInterface::class => function (Psr\Container\ContainerInterface $container) + { + return new Symfony\Component\HttpClient\Psr18Client( + new Symfony\Component\HttpClient\NativeHttpClient(), + $container->get(Psr\Http\Message\ResponseFactoryInterface::class), + $container->get(Psr\Http\Message\StreamFactoryInterface::class) + ); + }, + ], + 'aliases' => [ + Articus\DataTransfer\ClassMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\Annotation::class, + Articus\DataTransfer\FieldMetadataProviderInterface::class => Articus\DataTransfer\MetadataProvider\Annotation::class, + ], +]; +$config = [ + 'dependencies' => $dependencies, + + //Configure DataTransfer library + Articus\DataTransfer\Strategy\PluginManager::class => [ + 'invokables' => [ + 'QueryStringScalar' => OpenAPIGenerator\Common\Strategy\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Strategy\QueryStringScalarArray::class, + ], + 'factories' => [ + 'Date' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDate::class, + 'DateTime' => OpenAPIGenerator\Common\Strategy\Factory\ImmutableDateTime::class, + 'ObjectList' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectList::class, + 'ObjectMap' => OpenAPIGenerator\Common\Strategy\Factory\NoArgObjectMap::class, + 'ScalarList' => OpenAPIGenerator\Common\Strategy\Factory\ScalarList::class, + 'ScalarMap' => OpenAPIGenerator\Common\Strategy\Factory\ScalarMap::class, + ] + ], + Articus\DataTransfer\Validator\PluginManager::class => [ + 'invokables' => [ + 'Scalar' => OpenAPIGenerator\Common\Validator\Scalar::class, + 'QueryStringScalar' => OpenAPIGenerator\Common\Validator\QueryStringScalar::class, + 'QueryStringScalarArray' => OpenAPIGenerator\Common\Validator\QueryStringScalarArray::class, + ], + 'abstract_factories' => [ + Articus\DataTransfer\Validator\Factory\Laminas::class, + ], + ], + 'validators' => [ + 'invokables' => [ + 'Count' => Laminas\Validator\IsCountable::class, + ], + ], + + //Set API server URL here + App\ApiClient::class => [ + //'server_url' => 'https://api.url', + ], + + //Register body coders for used content types here + OpenAPIGenerator\APIClient\BodyCoder\PluginManager::class => [ + 'factories' => [ + //'another/mime-type' => AnotherMimeTypeBodyCoder::class + ], + ], + + //Register security providers for used security schemes here + OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class => [ + 'factories' => [ + //'another-security-scheme' => AnotherSecuritySchemeProvider::class, + ], + 'aliases' => [ + //'custom-name-for-htt-bearer' => OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class, + ], + ], +]; +$container = new Laminas\ServiceManager\ServiceManager($dependencies); +$container->setService('config', $config); +$container->setAlias('Config', 'config'); + +/** @var App\ApiClient $client */ +$client = $container->get(App\ApiClient::class); +//... and now you can use client methods to call API operations :) + +//And one more sample: how to set token for HTTP Bearer authentication +/** @var OpenAPIGenerator\APIClient\SecurityProvider\PluginManager $securityProviders */ +$securityProviders = $container->get(OpenAPIGenerator\APIClient\SecurityProvider\PluginManager::class); +/** @var OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer $httpBearer */ +$httpBearer = $securityProviders->get(OpenAPIGenerator\APIClient\SecurityProvider\HttpBearer::class); +$httpBearer->setToken('some-token'); + +``` diff --git a/samples/client/petstore/php-dt/composer.json b/samples/client/petstore/php-dt/composer.json new file mode 100644 index 00000000000..e50aa59117e --- /dev/null +++ b/samples/client/petstore/php-dt/composer.json @@ -0,0 +1,27 @@ +{ + "name": "git_user_id/git_repo_id", + "description": "", + "license": "unlicense", + "version": "1.0.0", + "type": "library", + "require": { + "php": "^7.3 || ^8.0", + "articus/data-transfer": "^0.5", + "articus/openapi-generator-common": "^0.2", + "articus/openapi-generator-apiclient": "^0.1", + "doctrine/annotations": "^1.10", + "psr/simple-cache": "^1.0", + "laminas/laminas-stdlib": "^3.2", + "laminas/laminas-validator": "^2.13" + }, + "autoload": { + "psr-4": { + "": "src/" + } + }, + "require-dev": { + "laminas/laminas-servicemanager": "^3.6", + "laminas/laminas-diactoros": "^2.6", + "symfony/http-client": "^5.3" + } +} \ No newline at end of file diff --git a/samples/client/petstore/php-dt/src/App/ApiClient.php b/samples/client/petstore/php-dt/src/App/ApiClient.php new file mode 100644 index 00000000000..2ad89d55ad6 --- /dev/null +++ b/samples/client/petstore/php-dt/src/App/ApiClient.php @@ -0,0 +1,1471 @@ + ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Add a new pet to the store + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function addPet( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->addPetRaw($requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 405: + /* Invalid input */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Add a new pet to the store + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function addPetResult( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->addPet($requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion + + //region createUser + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUserRaw( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUser( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUserRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Create user + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUserResult( + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ) + { + return $this->getSuccessfulContent(...$this->createUser($requestContent, $security, $requestMediaType)); + } + //endregion + + //region createUsersWithArrayInput + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUsersWithArrayInputRaw( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user/createWithArray', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUsersWithArrayInput( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUsersWithArrayInputRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUsersWithArrayInputResult( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ) + { + return $this->getSuccessfulContent(...$this->createUsersWithArrayInput($requestContent, $security, $requestMediaType)); + } + //endregion + + //region createUsersWithListInput + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function createUsersWithListInputRaw( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/user/createWithList', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function createUsersWithListInput( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->createUsersWithListInputRaw($requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Creates list of users with given input array + * @param \App\DTO\Collection36 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function createUsersWithListInputResult( + \App\DTO\Collection36 $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ) + { + return $this->getSuccessfulContent(...$this->createUsersWithListInput($requestContent, $security, $requestMediaType)); + } + //endregion + + //region deleteOrder + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deleteOrderRaw( + \App\DTO\DeleteOrderParameterData $parameters + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/store/order/{orderId}', $this->getPathParameters($parameters), []); + return $this->httpClient->sendRequest($request); + } + + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deleteOrder( + \App\DTO\DeleteOrderParameterData $parameters + ): array + { + $response = $this->deleteOrderRaw($parameters); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Order not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Delete purchase order by ID + * @param \App\DTO\DeleteOrderParameterData $parameters + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deleteOrderResult( + \App\DTO\DeleteOrderParameterData $parameters + ) + { + return $this->getSuccessfulContent(...$this->deleteOrder($parameters)); + } + //endregion + + //region deletePet + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deletePetRaw( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addCustomHeaders($request, $parameters); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deletePet( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ): array + { + $response = $this->deletePetRaw($parameters, $security); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid pet value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Deletes a pet + * @param \App\DTO\DeletePetParameterData $parameters + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deletePetResult( + \App\DTO\DeletePetParameterData $parameters, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]] + ) + { + return $this->getSuccessfulContent(...$this->deletePet($parameters, $security)); + } + //endregion + + //region deleteUser + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function deleteUserRaw( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ): ResponseInterface + { + $request = $this->createRequest('DELETE', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function deleteUser( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ): array + { + $response = $this->deleteUserRaw($parameters, $security); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid username supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Delete user + * @param \App\DTO\DeleteUserParameterData $parameters + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function deleteUserResult( + \App\DTO\DeleteUserParameterData $parameters, + iterable $security = ['api_key' => []] + ) + { + return $this->getSuccessfulContent(...$this->deleteUser($parameters, $security)); + } + //endregion + + //region findPetsByStatus + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function findPetsByStatusRaw( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/findByStatus', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function findPetsByStatus( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->findPetsByStatusRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection19(); + break; + case 400: + /* Invalid status value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Finds Pets by status + * @param \App\DTO\FindPetsByStatusParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection19 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function findPetsByStatusResult( + \App\DTO\FindPetsByStatusParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): \App\DTO\Collection19 + { + return $this->getSuccessfulContent(...$this->findPetsByStatus($parameters, $security, $responseMediaType)); + } + //endregion + + //region findPetsByTags + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function findPetsByTagsRaw( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/findByTags', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function findPetsByTags( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->findPetsByTagsRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection26(); + break; + case 400: + /* Invalid tag value */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Finds Pets by tags + * @param \App\DTO\FindPetsByTagsParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection26 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function findPetsByTagsResult( + \App\DTO\FindPetsByTagsParameterData $parameters, + iterable $security = ['petstore_auth' => ['read:pets', ]], + string $responseMediaType = 'application/xml' + ): \App\DTO\Collection26 + { + return $this->getSuccessfulContent(...$this->findPetsByTags($parameters, $security, $responseMediaType)); + } + //endregion + + //region getInventory + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getInventoryRaw( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/store/inventory', [], []); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getInventory( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): array + { + $response = $this->getInventoryRaw($security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Collection34(); + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Returns pet inventories by status + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Collection34 + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getInventoryResult( + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/json' + ): \App\DTO\Collection34 + { + return $this->getSuccessfulContent(...$this->getInventory($security, $responseMediaType)); + } + //endregion + + //region getOrderById + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getOrderByIdRaw( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/store/order/{orderId}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getOrderById( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getOrderByIdRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Order(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Order not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Find purchase order by ID + * @param \App\DTO\GetOrderByIdParameterData $parameters + * @param string $responseMediaType + * @return \App\DTO\Order + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getOrderByIdResult( + \App\DTO\GetOrderByIdParameterData $parameters, + string $responseMediaType = 'application/xml' + ): \App\DTO\Order + { + return $this->getSuccessfulContent(...$this->getOrderById($parameters, $responseMediaType)); + } + //endregion + + //region getPetById + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getPetByIdRaw( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getPetById( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getPetByIdRaw($parameters, $security, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Pet not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Find pet by ID + * @param \App\DTO\GetPetByIdParameterData $parameters + * @param iterable|string[][] $security + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getPetByIdResult( + \App\DTO\GetPetByIdParameterData $parameters, + iterable $security = ['api_key' => []], + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->getPetById($parameters, $security, $responseMediaType)); + } + //endregion + + //region getUserByName + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function getUserByNameRaw( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function getUserByName( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->getUserByNameRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\User(); + break; + case 400: + /* Invalid username supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Get user by user name + * @param \App\DTO\GetUserByNameParameterData $parameters + * @param string $responseMediaType + * @return \App\DTO\User + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function getUserByNameResult( + \App\DTO\GetUserByNameParameterData $parameters, + string $responseMediaType = 'application/xml' + ): \App\DTO\User + { + return $this->getSuccessfulContent(...$this->getUserByName($parameters, $responseMediaType)); + } + //endregion + + //region loginUser + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function loginUserRaw( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/login', [], $this->getQueryParameters($parameters)); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function loginUser( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->loginUserRaw($parameters, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + break; + case 400: + /* Invalid username/password supplied */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Logs user into the system + * @param \App\DTO\LoginUserParameterData $parameters + * @param string $responseMediaType + * @return string + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function loginUserResult( + \App\DTO\LoginUserParameterData $parameters, + string $responseMediaType = 'application/xml' + ): string + { + return $this->getSuccessfulContent(...$this->loginUser($parameters, $responseMediaType)); + } + //endregion + + //region logoutUser + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function logoutUserRaw( + iterable $security = ['api_key' => []] + ): ResponseInterface + { + $request = $this->createRequest('GET', '/user/logout', [], []); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function logoutUser( + iterable $security = ['api_key' => []] + ): array + { + $response = $this->logoutUserRaw($security); + $responseContent = null; + switch ($response->getStatusCode()) + { + default: + /* successful operation */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Logs out current logged in user session + * @param iterable|string[][] $security + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function logoutUserResult( + iterable $security = ['api_key' => []] + ) + { + return $this->getSuccessfulContent(...$this->logoutUser($security)); + } + //endregion + + //region placeOrder + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function placeOrderRaw( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/store/order', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + return $this->httpClient->sendRequest($request); + } + + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function placeOrder( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->placeOrderRaw($requestContent, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Order(); + break; + case 400: + /* Invalid Order */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Place an order for a pet + * @param \App\DTO\Order $requestContent + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Order + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function placeOrderResult( + \App\DTO\Order $requestContent, + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Order + { + return $this->getSuccessfulContent(...$this->placeOrder($requestContent, $requestMediaType, $responseMediaType)); + } + //endregion + + //region updatePet + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updatePetRaw( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): ResponseInterface + { + $request = $this->createRequest('PUT', '/pet', [], []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updatePet( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): array + { + $response = $this->updatePetRaw($requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\Pet(); + break; + case 400: + /* Invalid ID supplied */ + break; + case 404: + /* Pet not found */ + break; + case 405: + /* Validation exception */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Update an existing pet + * @param \App\DTO\Pet $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\Pet + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updatePetResult( + \App\DTO\Pet $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/json', + string $responseMediaType = 'application/xml' + ): \App\DTO\Pet + { + return $this->getSuccessfulContent(...$this->updatePet($requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion + + //region updatePetWithForm + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updatePetWithFormRaw( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet/{petId}', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updatePetWithForm( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ): array + { + $response = $this->updatePetWithFormRaw($parameters, $requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 405: + /* Invalid input */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Updates a pet in the store with form data + * @param \App\DTO\UpdatePetWithFormParameterData $parameters + * @param \App\DTO\InlineObject $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updatePetWithFormResult( + \App\DTO\UpdatePetWithFormParameterData $parameters, + \App\DTO\InlineObject $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'application/x-www-form-urlencoded' + ) + { + return $this->getSuccessfulContent(...$this->updatePetWithForm($parameters, $requestContent, $security, $requestMediaType)); + } + //endregion + + //region updateUser + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function updateUserRaw( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('PUT', '/user/{username}', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function updateUser( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ): array + { + $response = $this->updateUserRaw($parameters, $requestContent, $security, $requestMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 400: + /* Invalid user supplied */ + break; + case 404: + /* User not found */ + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * Updated user + * @param \App\DTO\UpdateUserParameterData $parameters + * @param \App\DTO\User $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @return mixed + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function updateUserResult( + \App\DTO\UpdateUserParameterData $parameters, + \App\DTO\User $requestContent, + iterable $security = ['api_key' => []], + string $requestMediaType = 'application/json' + ) + { + return $this->getSuccessfulContent(...$this->updateUser($parameters, $requestContent, $security, $requestMediaType)); + } + //endregion + + //region uploadFile + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return ResponseInterface + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + */ + public function uploadFileRaw( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): ResponseInterface + { + $request = $this->createRequest('POST', '/pet/{petId}/uploadImage', $this->getPathParameters($parameters), []); + $request = $this->addBody($request, $requestMediaType, $requestContent); + $request = $this->addAcceptHeader($request, $responseMediaType); + $request = $this->addSecurity($request, $security); + return $this->httpClient->sendRequest($request); + } + + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return array + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + */ + public function uploadFile( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): array + { + $response = $this->uploadFileRaw($parameters, $requestContent, $security, $requestMediaType, $responseMediaType); + $responseContent = null; + switch ($response->getStatusCode()) + { + case 200: + /* successful operation */ + $responseContent = new \App\DTO\ApiResponse(); + break; + } + $this->parseBody($response, $responseContent); + return [$responseContent, $response->getHeaders(), $response->getStatusCode(), $response->getReasonPhrase()]; + } + + /** + * uploads an image + * @param \App\DTO\UploadFileParameterData $parameters + * @param \App\DTO\InlineObject1 $requestContent + * @param iterable|string[][] $security + * @param string $requestMediaType + * @param string $responseMediaType + * @return \App\DTO\ApiResponse + * @throws ClientExceptionInterface + * @throws DT\Exception\InvalidData + * @throws OAGAC\Exception\InvalidResponseBodySchema + * @throws OAGAC\Exception\UnsuccessfulResponse + */ + public function uploadFileResult( + \App\DTO\UploadFileParameterData $parameters, + \App\DTO\InlineObject1 $requestContent, + iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]], + string $requestMediaType = 'multipart/form-data', + string $responseMediaType = 'application/json' + ): \App\DTO\ApiResponse + { + return $this->getSuccessfulContent(...$this->uploadFile($parameters, $requestContent, $security, $requestMediaType, $responseMediaType)); + } + //endregion +} + diff --git a/samples/client/petstore/php-dt/src/App/ApiClientFactory.php b/samples/client/petstore/php-dt/src/App/ApiClientFactory.php new file mode 100644 index 00000000000..3a1725e7b12 --- /dev/null +++ b/samples/client/petstore/php-dt/src/App/ApiClientFactory.php @@ -0,0 +1,30 @@ +getServiceConfig($container), $options ?? [])); + return new ApiClient( + $config->serverUrl, + $container->get($config->dataTransferServiceName), + $container->get($config->requestFactoryServiceName), + $container->get($config->httpClientServiceName), + $container->get($config->securityProviderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName), + $container->get($config->bodyCoderFactoryServiceName) + ); + } +} diff --git a/samples/client/petstore/php-dt/src/App/DTO/ApiResponse.php b/samples/client/petstore/php-dt/src/App/DTO/ApiResponse.php new file mode 100644 index 00000000000..0161f75b2b2 --- /dev/null +++ b/samples/client/petstore/php-dt/src/App/DTO/ApiResponse.php @@ -0,0 +1,34 @@ + Date: Sun, 15 Aug 2021 16:36:45 +0200 Subject: [PATCH 64/72] Add support for Micronaut Client (#10063) * Create initial version of openapi micronaut generator * Update validation, authorization, query parameters and time format * Move micronaut to its own generator * Add micronaut documentation * Refactor and add tests to JavaMicronautClientGenerator * Refactor model mustache for micronaut client * Refactor model enum and pojo mustache files for micronaut client * Move micronaut client generation to micronaut 3.0.0-M5 version * Generate samples for micronaut client * Add hidden files of generated samples for micronaut client * Add and configure micronaut tests as maven profile * Add option to choose between junit and spock for micronaut client generator * Add tests for micronaut 'build' and 'test' options; regenerate micronaut samples --- bin/configs/java-micronaut-client.yaml | 9 + docs/generators/micronaut-client.md | 297 ++++++ .../languages/JavaMicronautClientCodegen.java | 327 ++++++ .../org.openapitools.codegen.CodegenConfig | 1 + .../java-micronaut-client/api.mustache | 70 ++ .../api_test.groovy.mustache | 48 + .../java-micronaut-client/api_test.mustache | 47 + .../auth/Authorization.mustache | 40 + .../auth/AuthorizationBinder.mustache | 72 ++ .../auth/AuthorizationFilter.mustache | 157 +++ .../auth/Authorizations.mustache | 21 + .../ApiKeyAuthConfiguration.mustache | 79 ++ .../ConfigurableAuthorization.mustache | 14 + .../HttpBasicAuthConfiguration.mustache | 55 + .../configuration/Application.mustache | 9 + .../configuration/application.yml.mustache | 62 ++ .../configuration/git/git_push.sh.mustache | 58 ++ .../configuration/git/gitignore.mustache | 21 + .../gradle/build.gradle.mustache | 51 + .../gradle/gradle.properties.mustache | 1 + .../gradle/settings.gradle.mustache | 1 + .../configuration/gradlew/gradle-wrapper.jar | 0 .../gradle-wrapper.properties.mustache | 5 + .../gradlew/gradlew.bat.mustache | 89 ++ .../configuration/gradlew/gradlew.mustache | 185 ++++ .../MavenWrapperDownloader.java.mustache | 124 +++ .../mavenw/maven-wrapper.jar.mustache | Bin 0 -> 50710 bytes .../mavenw/maven-wrapper.properties.mustache | 2 + .../configuration/mavenw/mvnw.bat.mustache | 182 ++++ .../configuration/mavenw/mvnw.mustache | 310 ++++++ .../configuration/pom.xml.mustache | 195 ++++ .../java-micronaut-client/doc/README.mustache | 39 + .../doc/api_doc.mustache | 68 ++ .../java-micronaut-client/doc/auth.mustache | 25 + .../doc/enum_outer_doc.mustache | 7 + .../doc/model_doc.mustache | 4 + .../doc/pojo_doc.mustache | 39 + .../generatedAnnotation.mustache | 1 + .../licenseInfo.mustache | 11 + .../model/beanValidation.mustache | 52 + .../model/jackson_annotations.mustache | 26 + .../model/model.mustache | 48 + .../model/modelEnum.mustache | 61 ++ .../model/modelInnerEnum.mustache | 60 ++ .../model/oneof_interface.mustache | 9 + .../java-micronaut-client/model/pojo.mustache | 330 ++++++ .../model/typeInfoAnnotation.mustache | 16 + .../model/xmlAnnotation.mustache | 6 + .../model_test.groovy.mustache | 46 + .../java-micronaut-client/model_test.mustache | 49 + .../params/beanValidation.mustache | 34 + .../params/bodyParams.mustache | 1 + .../params/cookieParams.mustache | 1 + .../params/formParams.mustache | 1 + .../params/headerParams.mustache | 1 + .../params/pathParams.mustache | 1 + .../params/queryParams.mustache | 1 + .../params/type.mustache | 1 + .../query/QueryParam.mustache | 78 ++ .../query/QueryParamBinder.mustache | 164 +++ .../micronaut/MicronautClientCodegenTest.java | 250 +++++ pom.xml | 12 + .../petstore/java-micronaut-client/.gitignore | 21 + .../.mvn/wrapper/MavenWrapperDownloader.java | 124 +++ .../.mvn/wrapper/maren-wrapper.properties | 2 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 123 +++ .../.openapi-generator/VERSION | 1 + .../petstore/java-micronaut-client/README.md | 49 + .../java-micronaut-client/build.gradle | 44 + .../docs/AdditionalPropertiesAnyType.md | 16 + .../docs/AdditionalPropertiesArray.md | 16 + .../docs/AdditionalPropertiesBoolean.md | 16 + .../docs/AdditionalPropertiesClass.md | 26 + .../docs/AdditionalPropertiesInteger.md | 16 + .../docs/AdditionalPropertiesNumber.md | 16 + .../docs/AdditionalPropertiesObject.md | 16 + .../docs/AdditionalPropertiesString.md | 16 + .../java-micronaut-client/docs/Animal.md | 17 + .../docs/AnotherFakeApi.md | 62 ++ .../docs/ArrayOfArrayOfNumberOnly.md | 16 + .../docs/ArrayOfNumberOnly.md | 16 + .../java-micronaut-client/docs/ArrayTest.md | 18 + .../java-micronaut-client/docs/BigCat.md | 26 + .../java-micronaut-client/docs/BigCatAllOf.md | 26 + .../docs/Capitalization.md | 21 + .../java-micronaut-client/docs/Cat.md | 16 + .../java-micronaut-client/docs/CatAllOf.md | 16 + .../java-micronaut-client/docs/Category.md | 17 + .../java-micronaut-client/docs/ClassModel.md | 17 + .../java-micronaut-client/docs/Dog.md | 16 + .../java-micronaut-client/docs/DogAllOf.md | 16 + .../java-micronaut-client/docs/EnumArrays.md | 33 + .../java-micronaut-client/docs/EnumClass.md | 15 + .../java-micronaut-client/docs/EnumTest.md | 54 + .../java-micronaut-client/docs/FakeApi.md | 417 ++++++++ .../docs/FakeClassnameTags123Api.md | 63 ++ .../docs/FileSchemaTestClass.md | 17 + .../java-micronaut-client/docs/FormatTest.md | 29 + .../docs/HasOnlyReadOnly.md | 17 + .../java-micronaut-client/docs/MapTest.md | 27 + ...dPropertiesAndAdditionalPropertiesClass.md | 18 + .../docs/Model200Response.md | 18 + .../docs/ModelApiResponse.md | 18 + .../java-micronaut-client/docs/ModelClient.md | 16 + .../java-micronaut-client/docs/ModelReturn.md | 17 + .../java-micronaut-client/docs/Name.md | 20 + .../java-micronaut-client/docs/NumberOnly.md | 16 + .../java-micronaut-client/docs/Order.md | 30 + .../docs/OuterComposite.md | 18 + .../java-micronaut-client/docs/OuterEnum.md | 15 + .../java-micronaut-client/docs/Pet.md | 30 + .../java-micronaut-client/docs/PetApi.md | 270 +++++ .../docs/ReadOnlyFirst.md | 17 + .../docs/SpecialModelName.md | 16 + .../java-micronaut-client/docs/StoreApi.md | 134 +++ .../java-micronaut-client/docs/Tag.md | 17 + .../docs/TypeHolderDefault.md | 20 + .../docs/TypeHolderExample.md | 21 + .../java-micronaut-client/docs/User.md | 23 + .../java-micronaut-client/docs/UserApi.md | 226 ++++ .../java-micronaut-client/docs/XmlItem.md | 44 + .../java-micronaut-client/docs/auth.md | 26 + .../java-micronaut-client/gradle.properties | 1 + .../gradle/wrapper/gradle-wrapper.jar | 0 .../gradle/wrapper/gradle-wrapper.properties | 5 + .../petstore/java-micronaut-client/gradlew | 185 ++++ .../java-micronaut-client/gradlew.bat | 89 ++ .../petstore/java-micronaut-client/hello.txt | 1 + .../petstore/java-micronaut-client/mvnw | 310 ++++++ .../petstore/java-micronaut-client/mvnw.bat | 182 ++++ .../petstore/java-micronaut-client/pom.xml | 174 ++++ .../java-micronaut-client/settings.gradle | 1 + .../org/openapitools/api/AnotherFakeApi.java | 48 + .../java/org/openapitools/api/FakeApi.java | 280 +++++ .../api/FakeClassnameTags123Api.java | 48 + .../java/org/openapitools/api/PetApi.java | 163 +++ .../java/org/openapitools/api/StoreApi.java | 82 ++ .../java/org/openapitools/api/UserApi.java | 132 +++ .../model/AdditionalPropertiesAnyType.java | 103 ++ .../model/AdditionalPropertiesArray.java | 104 ++ .../model/AdditionalPropertiesBoolean.java | 103 ++ .../model/AdditionalPropertiesClass.java | 457 ++++++++ .../model/AdditionalPropertiesInteger.java | 103 ++ .../model/AdditionalPropertiesNumber.java | 104 ++ .../model/AdditionalPropertiesObject.java | 103 ++ .../model/AdditionalPropertiesString.java | 103 ++ .../java/org/openapitools/model/Animal.java | 137 +++ .../model/ArrayOfArrayOfNumberOnly.java | 110 ++ .../openapitools/model/ArrayOfNumberOnly.java | 110 ++ .../org/openapitools/model/ArrayTest.java | 184 ++++ .../java/org/openapitools/model/BigCat.java | 138 +++ .../org/openapitools/model/BigCatAllOf.java | 134 +++ .../openapitools/model/Capitalization.java | 244 +++++ .../main/java/org/openapitools/model/Cat.java | 103 ++ .../java/org/openapitools/model/CatAllOf.java | 99 ++ .../java/org/openapitools/model/Category.java | 128 +++ .../org/openapitools/model/ClassModel.java | 100 ++ .../main/java/org/openapitools/model/Dog.java | 103 ++ .../java/org/openapitools/model/DogAllOf.java | 99 ++ .../org/openapitools/model/EnumArrays.java | 204 ++++ .../org/openapitools/model/EnumClass.java | 62 ++ .../java/org/openapitools/model/EnumTest.java | 350 +++++++ .../model/FileSchemaTestClass.java | 139 +++ .../org/openapitools/model/FormatTest.java | 507 +++++++++ .../openapitools/model/HasOnlyReadOnly.java | 106 ++ .../java/org/openapitools/model/MapTest.java | 254 +++++ ...ropertiesAndAdditionalPropertiesClass.java | 173 +++ .../openapitools/model/Model200Response.java | 129 +++ .../openapitools/model/ModelApiResponse.java | 157 +++ .../org/openapitools/model/ModelClient.java | 99 ++ .../org/openapitools/model/ModelReturn.java | 100 ++ .../java/org/openapitools/model/Name.java | 165 +++ .../org/openapitools/model/NumberOnly.java | 100 ++ .../java/org/openapitools/model/Order.java | 281 +++++ .../openapitools/model/OuterComposite.java | 158 +++ .../org/openapitools/model/OuterEnum.java | 62 ++ .../main/java/org/openapitools/model/Pet.java | 298 ++++++ .../org/openapitools/model/ReadOnlyFirst.java | 117 +++ .../openapitools/model/SpecialModelName.java | 99 ++ .../main/java/org/openapitools/model/Tag.java | 128 +++ .../openapitools/model/TypeHolderDefault.java | 223 ++++ .../openapitools/model/TypeHolderExample.java | 252 +++++ .../java/org/openapitools/model/User.java | 302 ++++++ .../java/org/openapitools/model/XmlItem.java | 986 ++++++++++++++++++ .../org/openapitools/query/QueryParam.java | 89 ++ .../openapitools/query/QueryParamBinder.java | 175 ++++ .../src/main/resources/application.yml | 32 + .../api/AnotherFakeApiSpec.groovy | 41 + .../org/openapitools/api/FakeApiSpec.groovy | 295 ++++++ .../api/FakeClassnameTags123ApiSpec.groovy | 41 + .../org/openapitools/api/PetApiSpec.groovy | 258 +++++ .../org/openapitools/api/StoreApiSpec.groovy | 79 ++ .../org/openapitools/api/UserApiSpec.groovy | 151 +++ .../AdditionalPropertiesAnyTypeSpec.groovy | 32 + .../AdditionalPropertiesArraySpec.groovy | 33 + .../AdditionalPropertiesBooleanSpec.groovy | 32 + .../AdditionalPropertiesClassSpec.groovy | 104 ++ .../AdditionalPropertiesIntegerSpec.groovy | 32 + .../AdditionalPropertiesNumberSpec.groovy | 33 + .../AdditionalPropertiesObjectSpec.groovy | 32 + .../AdditionalPropertiesStringSpec.groovy | 32 + .../org/openapitools/model/AnimalSpec.groovy | 39 + .../model/ArrayOfArrayOfNumberOnlySpec.groovy | 33 + .../model/ArrayOfNumberOnlySpec.groovy | 33 + .../openapitools/model/ArrayTestSpec.groovy | 47 + .../openapitools/model/BigCatAllOfSpec.groovy | 30 + .../org/openapitools/model/BigCatSpec.groovy | 53 + .../model/CapitalizationSpec.groovy | 65 ++ .../openapitools/model/CatAllOfSpec.groovy | 30 + .../org/openapitools/model/CatSpec.groovy | 46 + .../openapitools/model/CategorySpec.groovy | 37 + .../openapitools/model/ClassModelSpec.groovy | 30 + .../openapitools/model/DogAllOfSpec.groovy | 30 + .../org/openapitools/model/DogSpec.groovy | 46 + .../openapitools/model/EnumArraysSpec.groovy | 39 + .../openapitools/model/EnumClassSpec.groovy | 19 + .../openapitools/model/EnumTestSpec.groovy | 59 ++ .../model/FileSchemaTestClassSpec.groovy | 39 + .../openapitools/model/FormatTestSpec.groovy | 126 +++ .../model/HasOnlyReadOnlySpec.groovy | 37 + .../org/openapitools/model/MapTestSpec.groovy | 54 + ...iesAndAdditionalPropertiesClassSpec.groovy | 50 + .../model/Model200ResponseSpec.groovy | 37 + .../model/ModelApiResponseSpec.groovy | 44 + .../openapitools/model/ModelClientSpec.groovy | 30 + .../openapitools/model/ModelReturnSpec.groovy | 30 + .../org/openapitools/model/NameSpec.groovy | 51 + .../openapitools/model/NumberOnlySpec.groovy | 31 + .../org/openapitools/model/OrderSpec.groovy | 66 ++ .../model/OuterCompositeSpec.groovy | 45 + .../openapitools/model/OuterEnumSpec.groovy | 19 + .../org/openapitools/model/PetSpec.groovy | 71 ++ .../model/ReadOnlyFirstSpec.groovy | 37 + .../model/SpecialModelNameSpec.groovy | 30 + .../org/openapitools/model/TagSpec.groovy | 37 + .../model/TypeHolderDefaultSpec.groovy | 61 ++ .../model/TypeHolderExampleSpec.groovy | 68 ++ .../org/openapitools/model/UserSpec.groovy | 79 ++ .../org/openapitools/model/XmlItemSpec.groovy | 229 ++++ 240 files changed, 19920 insertions(+) create mode 100644 bin/configs/java-micronaut-client.yaml create mode 100644 docs/generators/micronaut-client.md create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/api.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.groovy.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorization.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationBinder.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationFilter.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorizations.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ApiKeyAuthConfiguration.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ConfigurableAuthorization.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/HttpBasicAuthConfiguration.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/Application.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/application.yml.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/git_push.sh.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/gitignore.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/build.gradle.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/gradle.properties.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/settings.gradle.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.jar create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.properties.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.bat.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/MavenWrapperDownloader.java.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.jar.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.properties.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.bat.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/pom.xml.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/README.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/api_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/auth.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/enum_outer_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/model_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/doc/pojo_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/generatedAnnotation.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/licenseInfo.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/beanValidation.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/jackson_annotations.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/model.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelEnum.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelInnerEnum.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/oneof_interface.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/pojo.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/typeInfoAnnotation.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model/xmlAnnotation.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.groovy.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/beanValidation.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/bodyParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/cookieParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/formParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/headerParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/pathParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/queryParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/params/type.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParam.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParamBinder.mustache create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java create mode 100644 samples/client/petstore/java-micronaut-client/.gitignore create mode 100644 samples/client/petstore/java-micronaut-client/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 samples/client/petstore/java-micronaut-client/.mvn/wrapper/maren-wrapper.properties create mode 100644 samples/client/petstore/java-micronaut-client/.openapi-generator-ignore create mode 100644 samples/client/petstore/java-micronaut-client/.openapi-generator/FILES create mode 100644 samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java-micronaut-client/README.md create mode 100644 samples/client/petstore/java-micronaut-client/build.gradle create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesAnyType.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesArray.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesBoolean.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesInteger.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesNumber.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesObject.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesString.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Animal.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/AnotherFakeApi.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ArrayOfArrayOfNumberOnly.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ArrayOfNumberOnly.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ArrayTest.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/BigCat.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/BigCatAllOf.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Capitalization.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Cat.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/CatAllOf.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Category.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ClassModel.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Dog.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/DogAllOf.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/EnumArrays.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/EnumClass.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/EnumTest.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/FakeApi.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/FakeClassnameTags123Api.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/FormatTest.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/HasOnlyReadOnly.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/MapTest.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Model200Response.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ModelApiResponse.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ModelClient.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ModelReturn.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Name.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/NumberOnly.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Order.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/OuterComposite.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/OuterEnum.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Pet.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/PetApi.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/ReadOnlyFirst.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/SpecialModelName.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/StoreApi.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/Tag.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/TypeHolderDefault.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/TypeHolderExample.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/User.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/UserApi.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/XmlItem.md create mode 100644 samples/client/petstore/java-micronaut-client/docs/auth.md create mode 100644 samples/client/petstore/java-micronaut-client/gradle.properties create mode 100644 samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/petstore/java-micronaut-client/gradlew create mode 100644 samples/client/petstore/java-micronaut-client/gradlew.bat create mode 100644 samples/client/petstore/java-micronaut-client/hello.txt create mode 100644 samples/client/petstore/java-micronaut-client/mvnw create mode 100644 samples/client/petstore/java-micronaut-client/mvnw.bat create mode 100644 samples/client/petstore/java-micronaut-client/pom.xml create mode 100644 samples/client/petstore/java-micronaut-client/settings.gradle create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/AnotherFakeApi.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/PetApi.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/UserApi.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParam.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParamBinder.java create mode 100644 samples/client/petstore/java-micronaut-client/src/main/resources/application.yml create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/AnotherFakeApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeClassnameTags123ApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/PetApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/UserApiSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesAnyTypeSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesArraySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesBooleanSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesClassSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesIntegerSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesNumberSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesObjectSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesStringSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AnimalSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfArrayOfNumberOnlySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfNumberOnlySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayTestSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatAllOfSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CapitalizationSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatAllOfSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CategorySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ClassModelSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogAllOfSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumArraysSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumClassSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumTestSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FileSchemaTestClassSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FormatTestSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/HasOnlyReadOnlySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MapTestSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/Model200ResponseSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelApiResponseSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelClientSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelReturnSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NameSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NumberOnlySpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OrderSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterCompositeSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterEnumSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/PetSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ReadOnlyFirstSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/SpecialModelNameSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TagSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderDefaultSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderExampleSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/UserSpec.groovy create mode 100644 samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/XmlItemSpec.groovy diff --git a/bin/configs/java-micronaut-client.yaml b/bin/configs/java-micronaut-client.yaml new file mode 100644 index 00000000000..35a356d8756 --- /dev/null +++ b/bin/configs/java-micronaut-client.yaml @@ -0,0 +1,9 @@ +generatorName: micronaut-client +outputDir: samples/client/petstore/java-micronaut-client/ +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +additionalProperties: + artifactId: petstore-micronaut + hideGenerationTimestamp: "true" + configureAuth: "false" + build: "all" + test: "spock" diff --git a/docs/generators/micronaut-client.md b/docs/generators/micronaut-client.md new file mode 100644 index 00000000000..14a2292f04a --- /dev/null +++ b/docs/generators/micronaut-client.md @@ -0,0 +1,297 @@ +--- +title: Config Options for micronaut-client +sidebar_label: micronaut-client +--- + +These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details. + +| Option | Description | Values | Default | +| ------ | ----------- | ------ | ------- | +|additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null| +|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null| +|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|apiPackage|package for generated api classes| |org.openapitools.api| +|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java| +|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-micronaut| +|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator| +|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0| +|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| +|booleanGetterPrefix|Set booleanGetterPrefix| |get| +|build|Specify for which build tool to generate files|
                        **gradle**
                        Gradle configuration is generated for the project
                        **all**
                        Both Gradle and Maven configurations are generated
                        **maven**
                        Maven configuration is generated for the project
                        |all| +|configPackage|Configuration package for generated code| |org.openapitools.configuration| +|configureAuth|Configure all the authorization methods as specified in the file| |false| +|developerEmail|developer email in generated pom.xml| |team@openapitools.org| +|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| +|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org| +|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org| +|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false| +|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
                        **false**
                        The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
                        **true**
                        Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
                        |true| +|discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| +|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| +|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false| +|groupId|groupId in generated pom.xml| |org.openapitools| +|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| +|ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false| +|invokerPackage|root package for generated code| |org.openapitools| +|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|
                        **true**
                        Use Java 8 classes such as Base64
                        **false**
                        Various third party libraries as needed
                        |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
                        **true**
                        The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
                        **false**
                        The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
                        |true| +|licenseName|The name of the license| |Unlicense| +|licenseUrl|The URL of the license| |http://unlicense.org| +|modelPackage|package for generated models| |org.openapitools.model| +|openApiNullable|Enable OpenAPI Jackson Nullable library| |true| +|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| +|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| +|parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| +|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| +|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git| +|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git| +|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator| +|serializableModel|boolean - toggle "implements Serializable" for generated models| |false| +|snapshotVersion|Uses a SNAPSHOT version.|
                        **true**
                        Use a SnapShot Version
                        **false**
                        Use a Release Version
                        |null| +|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| +|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|sourceFolder|source folder for generated code| |src/main/java| +|test|Specify which test tool to generate files for|
                        **junit**
                        Use JUnit as test tool
                        **spock**
                        Use Spock as test tool
                        |junit| +|title|Client service name| |OpenAPI Micronaut Client| +|useBeanValidation|Use BeanValidation API annotations| |true| +|withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false| + +## IMPORT MAPPING + +| Type/Alias | Imports | +| ---------- | ------- | +|Array|java.util.List| +|ArrayList|java.util.ArrayList| +|BigDecimal|java.math.BigDecimal| +|Date|java.util.Date| +|DateTime|org.joda.time.*| +|File|java.io.File| +|HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| +|List|java.util.*| +|LocalDate|org.joda.time.*| +|LocalDateTime|org.joda.time.*| +|LocalTime|org.joda.time.*| +|Map|java.util.Map| +|Set|java.util.*| +|Timestamp|java.sql.Timestamp| +|URI|java.net.URI| +|UUID|java.util.UUID| + + +## INSTANTIATION TYPES + +| Type/Alias | Instantiated By | +| ---------- | --------------- | +|array|ArrayList| +|map|HashMap| +|set|LinkedHashSet| + + +## LANGUAGE PRIMITIVES + +
                          +
                        • Boolean
                          • +
                        • Double
                          • +
                        • Float
                          • +
                        • Integer
                          • +
                        • Long
                          • +
                        • Object
                          • +
                        • String
                          • +
                        • boolean
                          • +
                        • byte[]
                          • +
                        + +## RESERVED WORDS + +
                          +
                        • abstract
                          • +
                        • apiclient
                          • +
                        • apiexception
                          • +
                        • apiresponse
                          • +
                        • application
                          • +
                        • assert
                          • +
                        • authorization
                          • +
                        • body
                          • +
                        • boolean
                          • +
                        • break
                          • +
                        • byte
                          • +
                        • case
                          • +
                        • catch
                          • +
                        • char
                          • +
                        • class
                          • +
                        • client
                          • +
                        • configuration
                          • +
                        • const
                          • +
                        • continue
                          • +
                        • cookie
                          • +
                        • default
                          • +
                        • do
                          • +
                        • double
                          • +
                        • else
                          • +
                        • enum
                          • +
                        • extends
                          • +
                        • final
                          • +
                        • finally
                          • +
                        • float
                          • +
                        • for
                          • +
                        • format
                          • +
                        • goto
                          • +
                        • header
                          • +
                        • if
                          • +
                        • implements
                          • +
                        • import
                          • +
                        • instanceof
                          • +
                        • int
                          • +
                        • interface
                          • +
                        • localreturntype
                          • +
                        • localvaraccept
                          • +
                        • localvaraccepts
                          • +
                        • localvarauthnames
                          • +
                        • localvarcollectionqueryparams
                          • +
                        • localvarcontenttype
                          • +
                        • localvarcontenttypes
                          • +
                        • localvarcookieparams
                          • +
                        • localvarformparams
                          • +
                        • localvarheaderparams
                          • +
                        • localvarpath
                          • +
                        • localvarpostbody
                          • +
                        • localvarqueryparams
                          • +
                        • long
                          • +
                        • native
                          • +
                        • new
                          • +
                        • null
                          • +
                        • object
                          • +
                        • package
                          • +
                        • pathvariable
                          • +
                        • private
                          • +
                        • protected
                          • +
                        • public
                          • +
                        • queryparam
                          • +
                        • queryvalue
                          • +
                        • return
                          • +
                        • short
                          • +
                        • static
                          • +
                        • strictfp
                          • +
                        • stringutil
                          • +
                        • super
                          • +
                        • switch
                          • +
                        • synchronized
                          • +
                        • this
                          • +
                        • throw
                          • +
                        • throws
                          • +
                        • transient
                          • +
                        • try
                          • +
                        • void
                          • +
                        • volatile
                          • +
                        • while
                          • +
                        + +## FEATURE SET + + +### Client Modification Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasePath|✓|ToolingExtension +|Authorizations|✗|ToolingExtension +|UserAgent|✗|ToolingExtension +|MockServer|✗|ToolingExtension + +### Data Type Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Custom|✗|OAS2,OAS3 +|Int32|✓|OAS2,OAS3 +|Int64|✓|OAS2,OAS3 +|Float|✓|OAS2,OAS3 +|Double|✓|OAS2,OAS3 +|Decimal|✓|ToolingExtension +|String|✓|OAS2,OAS3 +|Byte|✓|OAS2,OAS3 +|Binary|✓|OAS2,OAS3 +|Boolean|✓|OAS2,OAS3 +|Date|✓|OAS2,OAS3 +|DateTime|✓|OAS2,OAS3 +|Password|✓|OAS2,OAS3 +|File|✓|OAS2 +|Array|✓|OAS2,OAS3 +|Maps|✓|ToolingExtension +|CollectionFormat|✓|OAS2 +|CollectionFormatMulti|✓|OAS2 +|Enum|✓|OAS2,OAS3 +|ArrayOfEnum|✓|ToolingExtension +|ArrayOfModel|✓|ToolingExtension +|ArrayOfCollectionOfPrimitives|✓|ToolingExtension +|ArrayOfCollectionOfModel|✓|ToolingExtension +|ArrayOfCollectionOfEnum|✓|ToolingExtension +|MapOfEnum|✓|ToolingExtension +|MapOfModel|✓|ToolingExtension +|MapOfCollectionOfPrimitives|✓|ToolingExtension +|MapOfCollectionOfModel|✓|ToolingExtension +|MapOfCollectionOfEnum|✓|ToolingExtension + +### Documentation Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Readme|✓|ToolingExtension +|Model|✓|ToolingExtension +|Api|✓|ToolingExtension + +### Global Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Host|✓|OAS2,OAS3 +|BasePath|✓|OAS2,OAS3 +|Info|✓|OAS2,OAS3 +|Schemes|✗|OAS2,OAS3 +|PartialSchemes|✓|OAS2,OAS3 +|Consumes|✓|OAS2 +|Produces|✓|OAS2 +|ExternalDocumentation|✓|OAS2,OAS3 +|Examples|✓|OAS2,OAS3 +|XMLStructureDefinitions|✗|OAS2,OAS3 +|MultiServer|✗|OAS3 +|ParameterizedServer|✗|OAS3 +|ParameterStyling|✗|OAS3 +|Callbacks|✗|OAS3 +|LinkObjects|✗|OAS3 + +### Parameter Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Path|✓|OAS2,OAS3 +|Query|✓|OAS2,OAS3 +|Header|✓|OAS2,OAS3 +|Body|✓|OAS2 +|FormUnencoded|✓|OAS2 +|FormMultipart|✓|OAS2 +|Cookie|✓|OAS3 + +### Schema Support Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Simple|✓|OAS2,OAS3 +|Composite|✓|OAS2,OAS3 +|Polymorphism|✗|OAS2,OAS3 +|Union|✗|OAS3 + +### Security Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasicAuth|✓|OAS2,OAS3 +|ApiKey|✓|OAS2,OAS3 +|OpenIDConnect|✓|OAS3 +|BearerToken|✗|OAS3 +|OAuth2_Implicit|✓|OAS2,OAS3 +|OAuth2_Password|✓|OAS2,OAS3 +|OAuth2_ClientCredentials|✓|OAS2,OAS3 +|OAuth2_AuthorizationCode|✓|OAS2,OAS3 + +### Wire Format Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|JSON|✓|OAS2,OAS3 +|XML|✓|OAS2,OAS3 +|PROTOBUF|✗|ToolingExtension +|Custom|✗|OAS2,OAS3 diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java new file mode 100644 index 00000000000..047607d4903 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java @@ -0,0 +1,327 @@ +package org.openapitools.codegen.languages; + +import org.openapitools.codegen.*; +import org.openapitools.codegen.languages.features.BeanValidationFeatures; +import org.openapitools.codegen.meta.features.DocumentationFeature; +import org.openapitools.codegen.meta.features.SecurityFeature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.util.*; + +import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE; + + +public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements BeanValidationFeatures { + + private final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class); + + public static final String OPT_TITLE = "title"; + public static final String OPT_CONFIG_PACKAGE = "configPackage"; + public static final String OPT_CONFIGURE_AUTH = "configureAuth"; + public static final String OPT_BUILD = "build"; + public static final String OPT_BUILD_GRADLE = "gradle"; + public static final String OPT_BUILD_MAVEN = "maven"; + public static final String OPT_BUILD_ALL = "all"; + public static final String OPT_TEST = "test"; + public static final String OPT_TEST_JUNIT = "junit"; + public static final String OPT_TEST_SPOCK = "spock"; + + public static final String NAME = "micronaut-client"; + + protected String title; + protected String configPackage; + protected boolean useBeanValidation; + protected boolean configureAuthorization; + protected String buildTool; + protected String testTool; + + public JavaMicronautClientCodegen() { + super(); + + title = "OpenAPI Micronaut Client"; + invokerPackage = "org.openapitools"; + configPackage = "org.openapitools.configuration"; + useBeanValidation = true; + configureAuthorization = false; + buildTool = OPT_BUILD_ALL; + testTool = OPT_TEST_JUNIT; + + modifyFeatureSet(features -> features + .includeDocumentationFeatures( + DocumentationFeature.Readme + ) + .securityFeatures(EnumSet.of( + SecurityFeature.ApiKey, + SecurityFeature.BasicAuth, + SecurityFeature.OAuth2_Implicit, + SecurityFeature.OAuth2_AuthorizationCode, + SecurityFeature.OAuth2_ClientCredentials, + SecurityFeature.OAuth2_Password, + SecurityFeature.OpenIDConnect + )) + ); + + outputFolder = "generated-code/javaMicronaut"; + embeddedTemplateDir = templateDir = "java-micronaut-client"; + apiPackage = "org.openapitools.api"; + modelPackage = "org.openapitools.model"; + invokerPackage = "org.openapitools"; + artifactId = "openapi-micronaut"; + + updateOption(INVOKER_PACKAGE, this.getInvokerPackage()); + updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); + updateOption(CodegenConstants.API_PACKAGE, apiPackage); + updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); + + apiTestTemplateFiles.clear(); + + additionalProperties.put("jackson", "true"); + additionalProperties.put("openbrace", "{"); + additionalProperties.put("closebrace", "}"); + + cliOptions.add(new CliOption(OPT_TITLE, "Client service name").defaultValue(title)); + cliOptions.add(new CliOption(OPT_CONFIG_PACKAGE, "Configuration package for generated code").defaultValue(configPackage)); + cliOptions.add(CliOption.newBoolean(OPT_CONFIGURE_AUTH, "Configure all the authorization methods as specified in the file", configureAuthorization)); + cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation)); + + CliOption buildToolOption = new CliOption(OPT_BUILD, "Specify for which build tool to generate files").defaultValue(buildTool); + buildToolOption.setEnum(new HashMap(){{ + put(OPT_BUILD_GRADLE, "Gradle configuration is generated for the project"); + put(OPT_BUILD_MAVEN, "Maven configuration is generated for the project"); + put(OPT_BUILD_ALL, "Both Gradle and Maven configurations are generated"); + }}); + cliOptions.add(buildToolOption); + + CliOption testToolOption = new CliOption(OPT_TEST, "Specify which test tool to generate files for").defaultValue(testTool); + testToolOption.setEnum(new HashMap(){{ + put(OPT_TEST_JUNIT, "Use JUnit as test tool"); + put(OPT_TEST_SPOCK, "Use Spock as test tool"); + }}); + cliOptions.add(testToolOption); + + // Remove the date library option + cliOptions.stream().filter(o -> o.getOpt().equals("dateLibrary")).findFirst() + .ifPresent(v -> cliOptions.remove(v)); + + // Add reserved words + String[] reservedWordsArray = new String[]{ + "client", "format", "queryvalue", "queryparam", "pathvariable", "header", "cookie", + "authorization", "body", "application" + }; + reservedWords.addAll(Arrays.asList(reservedWordsArray)); + } + + @Override + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + @Override + public String getName() { + return NAME; + } + + @Override + public String getHelp() { + return "Generates a Java Micronaut Client."; + } + + @Override + public void processOpts() { + super.processOpts(); + + // Get properties + if (additionalProperties.containsKey(OPT_TITLE)) { + this.title = (String) additionalProperties.get(OPT_TITLE); + } + + if (additionalProperties.containsKey(OPT_CONFIG_PACKAGE)) { + configPackage = (String) additionalProperties.get(OPT_CONFIG_PACKAGE); + } else { + additionalProperties.put(OPT_CONFIG_PACKAGE, configPackage); + } + + if (additionalProperties.containsKey(INVOKER_PACKAGE)) { + invokerPackage = (String) additionalProperties.get(INVOKER_PACKAGE); + } else { + additionalProperties.put(INVOKER_PACKAGE, invokerPackage); + } + + // Get boolean properties + if (additionalProperties.containsKey(USE_BEANVALIDATION)) { + this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION)); + } + writePropertyBack(USE_BEANVALIDATION, useBeanValidation); + + if (additionalProperties.containsKey(OPT_CONFIGURE_AUTH)) { + this.configureAuthorization = convertPropertyToBoolean(OPT_CONFIGURE_AUTH); + } + writePropertyBack(OPT_CONFIGURE_AUTH, configureAuthorization); + + // Get enum properties + if (additionalProperties.containsKey(OPT_BUILD)) { + switch ((String) additionalProperties.get(OPT_BUILD)) { + case OPT_BUILD_GRADLE: + case OPT_BUILD_MAVEN: + case OPT_BUILD_ALL: + this.buildTool = (String) additionalProperties.get(OPT_BUILD); + break; + default: + throw new RuntimeException("Build tool \"" + additionalProperties.get(OPT_BUILD) + "\" is not supported or misspelled."); + } + } + additionalProperties.put(OPT_BUILD, buildTool); + + if (additionalProperties.containsKey(OPT_TEST)) { + switch((String) additionalProperties.get(OPT_TEST)) { + case OPT_TEST_JUNIT: + case OPT_TEST_SPOCK: + this.testTool = (String) additionalProperties.get(OPT_TEST); + break; + default: + throw new RuntimeException("Test tool \"" + additionalProperties.get(OPT_TEST) + "\" is not supported or misspelled."); + } + } + additionalProperties.put(OPT_TEST, testTool); + if (testTool.equals(OPT_TEST_JUNIT)) { + additionalProperties.put("isTestJunit", true); + } else if (testTool.equals(OPT_TEST_SPOCK)) { + additionalProperties.put("isTestSpock", true); + } + + final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); + final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/"); + + // Add all the supporting files + String resourceFolder = projectFolder + "/resources"; + supportingFiles.add(new SupportingFile("configuration/application.yml.mustache", resourceFolder, "application.yml").doNotOverwrite()); + + // Authorization files + if (configureAuthorization) { + final String authFolder = invokerFolder + "/auth"; + supportingFiles.add(new SupportingFile("auth/Authorization.mustache", authFolder, "Authorization.java")); + supportingFiles.add(new SupportingFile("auth/AuthorizationBinder.mustache", authFolder, "AuthorizationBinder.java")); + supportingFiles.add(new SupportingFile("auth/Authorizations.mustache", authFolder, "Authorizations.java")); + supportingFiles.add(new SupportingFile("auth/AuthorizationFilter.mustache", authFolder, "AuthorizationFilter.java")); + final String authConfigurationFolder = authFolder + "/configuration"; + supportingFiles.add(new SupportingFile("auth/configuration/ApiKeyAuthConfiguration.mustache", authConfigurationFolder, "ApiKeyAuthConfiguration.java")); + supportingFiles.add(new SupportingFile("auth/configuration/ConfigurableAuthorization.mustache", authConfigurationFolder, "ConfigurableAuthorization.java")); + supportingFiles.add(new SupportingFile("auth/configuration/HttpBasicAuthConfiguration.mustache", authConfigurationFolder, "HttpBasicAuthConfiguration.java")); + } + + // Query files + final String queryFolder = invokerFolder + "/query"; + supportingFiles.add(new SupportingFile("query/QueryParam.mustache", queryFolder, "QueryParam.java")); + supportingFiles.add(new SupportingFile("query/QueryParamBinder.mustache", queryFolder, "QueryParamBinder.java")); + + if (buildTool.equals(OPT_BUILD_GRADLE) || buildTool.equals(OPT_BUILD_ALL)) { + // Gradle files + supportingFiles.add(new SupportingFile("configuration/gradle/build.gradle.mustache", "", "build.gradle").doNotOverwrite()); + supportingFiles.add(new SupportingFile("configuration/gradle/settings.gradle.mustache", "", "settings.gradle").doNotOverwrite()); + supportingFiles.add(new SupportingFile("configuration/gradle/gradle.properties.mustache", "", "gradle.properties").doNotOverwrite()); + + // Gradlew files + final String gradleWrapperFolder = "gradle/wrapper"; + supportingFiles.add(new SupportingFile("configuration/gradlew/gradlew.mustache", "", "gradlew")); + supportingFiles.add(new SupportingFile("configuration/gradlew/gradlew.bat.mustache", "", "gradlew.bat")); + supportingFiles.add(new SupportingFile("configuration/gradlew/gradle-wrapper.properties.mustache", gradleWrapperFolder, "gradle-wrapper.properties")); + supportingFiles.add(new SupportingFile("configuration/gradlew/gradle-wrapper.jar", gradleWrapperFolder, "gradle-wrapper.jar")); + } + + if (buildTool.equals(OPT_BUILD_MAVEN) || buildTool.equals(OPT_BUILD_ALL)) { + // Maven files + supportingFiles.add(new SupportingFile("configuration/pom.xml.mustache", "", "pom.xml").doNotOverwrite()); + + // Maven wrapper files + supportingFiles.add(new SupportingFile("configuration/mavenw/mvnw.mustache", "", "mvnw")); + supportingFiles.add(new SupportingFile("configuration/mavenw/mvnw.bat.mustache", "", "mvnw.bat")); + supportingFiles.add(new SupportingFile("configuration/mavenw/MavenWrapperDownloader.java.mustache", ".mvn/wrapper", "MavenWrapperDownloader.java")); + supportingFiles.add(new SupportingFile("configuration/mavenw/maven-wrapper.jar.mustache", ".mvn/wrapper", "maven-wrapper.jar")); + supportingFiles.add(new SupportingFile("configuration/mavenw/maven-wrapper.properties.mustache", ".mvn/wrapper", "maren-wrapper.properties")); + } + + // Git files + supportingFiles.add(new SupportingFile("configuration/git/gitignore.mustache", "", ".gitignore").doNotOverwrite()); + + // Use the default java Date + typeMapping.put("date", "LocalDate"); + typeMapping.put("DateTime", "LocalDateTime"); + importMapping.put("LocalDate", "java.time.LocalDate"); + importMapping.put("LocalDateTime", "java.time.LocalDateTime"); + + // Add documentation files + supportingFiles.add(new SupportingFile("doc/README.mustache", "", "README.md").doNotOverwrite()); + supportingFiles.add(new SupportingFile("doc/auth.mustache", apiDocPath, "auth.md")); + modelDocTemplateFiles.put("doc/model_doc.mustache", ".md"); + apiDocTemplateFiles.put("doc/api_doc.mustache", ".md"); + modelDocTemplateFiles.remove("model_doc.mustache"); + apiDocTemplateFiles.remove("api_doc.mustache"); + + // Add model files + modelTemplateFiles.remove("model.mustache"); + modelTemplateFiles.put("model/model.mustache", ".java"); + + // Add test files + if (testTool.equals(OPT_TEST_JUNIT)) { + apiTestTemplateFiles.put("api_test.mustache", ".java"); + modelTestTemplateFiles.put("model_test.mustache", ".java"); + } else if (testTool.equals(OPT_TEST_SPOCK)) { + apiTestTemplateFiles.put("api_test.groovy.mustache", ".groovy"); + modelTestTemplateFiles.put("model_test.groovy.mustache", ".groovy"); + } + } + + @Override + public String apiTestFileFolder() { + if (testTool.equals(OPT_TEST_SPOCK)) { + return getOutputDir() + "/src/test/groovy/" + getInvokerPackage().replaceAll("\\.", "/") + "/api"; + } + return getOutputDir() + "/src/test/java/" + getInvokerPackage().replaceAll("\\.", "/") + "/api"; + } + + @Override + public String modelTestFileFolder() { + if (testTool.equals(OPT_TEST_SPOCK)) { + return getOutputDir() + "/src/test/groovy/" + getInvokerPackage().replaceAll("\\.", "/") + "/model"; + } + return getOutputDir() + "/src/test/java/" + getInvokerPackage().replaceAll("\\.", "/") + "/model"; + } + + @Override + public String toApiTestFilename(String name) { + if (testTool.equals(OPT_TEST_SPOCK)) { + return toApiName(name) + "Spec"; + } + return toApiName(name) + "Test"; + } + + @Override + public String toModelTestFilename(String name) { + if (testTool.equals(OPT_TEST_SPOCK)) { + return toModelName(name) + "Spec"; + } + return toModelName(name) + "Test"; + } + + @Override + public void setUseBeanValidation(boolean useBeanValidation) { + this.useBeanValidation = useBeanValidation; + } + + @Override + public String toApiVarName(String name) { + String apiVarName = super.toApiVarName(name); + if (reservedWords.contains(apiVarName)) { + apiVarName = escapeReservedWord(apiVarName); + } + return apiVarName; + } + + public boolean isUseBeanValidation() { + return useBeanValidation; + } + + public boolean isConfigureAuthorization() { + return configureAuthorization; + } +} 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 edff28e636a..df636589cd5 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 @@ -55,6 +55,7 @@ org.openapitools.codegen.languages.HaskellServantCodegen org.openapitools.codegen.languages.JavaClientCodegen org.openapitools.codegen.languages.JavaCXFClientCodegen org.openapitools.codegen.languages.JavaInflectorServerCodegen +org.openapitools.codegen.languages.JavaMicronautClientCodegen org.openapitools.codegen.languages.JavaMSF4JServerCodegen org.openapitools.codegen.languages.JavaPKMSTServerCodegen org.openapitools.codegen.languages.JavaPlayFrameworkCodegen diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/api.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/api.mustache new file mode 100644 index 00000000000..4232340e520 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/api.mustache @@ -0,0 +1,70 @@ +{{>licenseInfo}} +package {{package}}; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +{{#configureAuth}} +import {{invokerPackage}}.auth.Authorization; +{{/configureAuth}} +import {{invokerPackage}}.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +{{#imports}}import {{import}}; +{{/imports}} +import javax.annotation.Generated; +{{^fullJavaUtil}} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +{{/fullJavaUtil}}{{#useBeanValidation}} +import javax.validation.Valid; +import javax.validation.constraints.*; +{{/useBeanValidation}} + +{{>generatedAnnotation}} +@Client("${base-path}") +public interface {{classname}} { +{{#operations}}{{#operation}} + /** + {{#summary}} + * {{summary}} + {{/summary}} + {{#notes}} + * {{notes}} + {{/notes}} + {{^summary}} + {{^notes}} + * {{nickname}} + {{/notes}} + {{/summary}} + * +{{#allParams}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}} +{{/allParams}} +{{#returnType}} + * @return {{returnType}} +{{/returnType}} +{{#externalDocs}} + * {{description}} + * @see {{summary}} Documentation +{{/externalDocs}} + */ + @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}") + {{#vendorExtensions.x-contentType}} + @Produces(value={"{{vendorExtensions.x-contentType}}"}) + {{/vendorExtensions.x-contentType}} + @Consumes(value={"{{vendorExtensions.x-accepts}}"}) + {{!auth methods}} + {{#configureAuth}} + {{#authMethods}} + @Authorization(name="{{{name}}}"{{!scopes}}{{#isOAuth}}, scopes={{=< >=}}{<={{ }}=>{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}{{=< >=}}}<={{ }}=>{{/isOAuth}}) + {{/authMethods}} + {{/configureAuth}} + {{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}}{{#allParams}} + {{>params/queryParams}}{{>params/pathParams}}{{>params/headerParams}}{{>params/bodyParams}}{{>params/formParams}}{{>params/cookieParams}}{{^-last}}, {{/-last}}{{#-last}} + );{{/-last}}{{/allParams}} + {{/operation}} +{{/operations}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.groovy.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.groovy.mustache new file mode 100644 index 00000000000..af4469421f3 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.groovy.mustache @@ -0,0 +1,48 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +import reactor.core.publisher.Mono +{{^fullJavaUtil}} +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map +{{/fullJavaUtil}} + + +/** + * API tests for {{classname}} + */ +@MicronautTest +class {{classname}}Spec extends Specification { + + @Inject + {{classname}} api + + {{#operations}}{{#operation}} + /** + * {{summary}} + {{#notes}} + * + * {{notes}} + {{/notes}} + */ + void '{{operationId}}() test'() { + given: + {{#allParams}} + {{{dataType}}} {{paramName}} = null + {{/allParams}} + // {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).block() + // {{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono{{/returnType}} asyncResponse = api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) + + expect: + true + // TODO: test validations + } + + {{/operation}}{{/operations}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.mustache new file mode 100644 index 00000000000..a3c3e48e44b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/api_test.mustache @@ -0,0 +1,47 @@ +package {{package}}; + +{{#imports}}import {{import}}; +{{/imports}} +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; +import jakarta.inject.Inject; +import reactor.core.publisher.Mono; + +{{^fullJavaUtil}} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +{{/fullJavaUtil}} + + +/** + * API tests for {{classname}} + */ +@MicronautTest +public class {{classname}}Test { + + @Inject + {{classname}} api; + + {{#operations}}{{#operation}} + /** + * {{summary}} + {{#notes}} + * + * {{notes}} + {{/notes}} + */ + @Test + public void {{operationId}}Test() { + {{#allParams}} + {{{dataType}}} {{paramName}} = null; + {{/allParams}} + // {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).block(); + // {{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono{{/returnType}} asyncResponse = api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); + // TODO: test validations + } + + {{/operation}}{{/operations}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorization.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorization.mustache new file mode 100644 index 00000000000..ac5f7f979fd --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorization.mustache @@ -0,0 +1,40 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth; + +import io.micronaut.context.annotation.AliasFor; +import io.micronaut.core.bind.annotation.Bindable; + +import java.lang.annotation.Documented; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@Documented +@Retention(RUNTIME) +@Target(METHOD) +@Bindable +@Repeatable(Authorizations.class) +public @interface Authorization { + /** + * The name of the authorization + */ + @AliasFor(annotation=Bindable.class, member="value") + String value() default ""; + + /** + * The name of the authorization + */ + @AliasFor(annotation=Bindable.class, member="value") + String name() default ""; + + /** + * The scopes for the oauth authorization + */ + String[] scopes() default {}; +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationBinder.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationBinder.mustache new file mode 100644 index 00000000000..fad44af0f00 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationBinder.mustache @@ -0,0 +1,72 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth; + +import io.micronaut.aop.MethodInvocationContext; +import io.micronaut.core.annotation.AnnotationValue; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.util.CollectionUtils; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.client.bind.AnnotatedClientRequestBinder; +import io.micronaut.http.client.bind.ClientRequestUriContext; +import jakarta.inject.Singleton; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@Singleton +public class AuthorizationBinder implements AnnotatedClientRequestBinder { + + public static final CharSequence AUTHORIZATION_NAMES = "micronaut.security.AUTHORIZATION_NAMES"; + + @NonNull + @Override + public Class getAnnotationType() { + return Authorization.class; + } + + @Override + public void bind(@NonNull MethodInvocationContext context, + @NonNull ClientRequestUriContext uriContext, + @NonNull MutableHttpRequest request + ) { + List> annotations = context.getAnnotationMetadata() + .getAnnotationValuesByType(Authorization.class); + + if (CollectionUtils.isNotEmpty(annotations)) { + List authorizationNames = new ArrayList<>(); + for (AnnotationValue annotation: annotations) { + annotation.get("name", String.class) + .filter(StringUtils::isNotEmpty) + .ifPresent(v -> authorizationNames.add(configurationName(v))); + } + request.setAttribute(AUTHORIZATION_NAMES, authorizationNames); + } + } + + private String configurationName(String name) { + StringBuilder result = new StringBuilder(); + + boolean wasCapital = false; + for (int i = 0; i < name.length(); ++i) { + char c = name.charAt(i); + if (c == '_') { + result.append('-'); + wasCapital = true; + } else if (Character.isUpperCase(c)) { + if (wasCapital) { + result.append(Character.toLowerCase(c)); + } else { + result.append('-'); + result.append(Character.toLowerCase(c)); + } + wasCapital = true; + } else { + result.append(c); + } + } + return result.toString(); + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationFilter.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationFilter.mustache new file mode 100644 index 00000000000..021a5425d39 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/AuthorizationFilter.mustache @@ -0,0 +1,157 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth; + +import io.micronaut.context.BeanContext; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; +import io.micronaut.core.util.CollectionUtils; +import io.micronaut.core.util.StringUtils; +import io.micronaut.core.util.Toggleable; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.HttpResponse; +import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.annotation.Filter; +import io.micronaut.http.filter.ClientFilterChain; +import io.micronaut.http.filter.HttpClientFilter; +import io.micronaut.inject.qualifiers.Qualifiers; +import io.micronaut.security.oauth2.client.clientcredentials.ClientCredentialsClient; +import io.micronaut.security.oauth2.client.clientcredentials.ClientCredentialsConfiguration; +import io.micronaut.security.oauth2.client.clientcredentials.propagation.ClientCredentialsHttpClientFilter; +import io.micronaut.security.oauth2.client.clientcredentials.propagation.ClientCredentialsTokenPropagator; +import io.micronaut.security.oauth2.configuration.OauthClientConfiguration; +import io.micronaut.security.oauth2.endpoint.token.response.TokenResponse; +import org.openapitools.auth.configuration.ConfigurableAuthorization; +import org.reactivestreams.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@Filter(Filter.MATCH_ALL_PATTERN) +public class AuthorizationFilter implements HttpClientFilter { + private static final Logger LOG = LoggerFactory.getLogger(ClientCredentialsHttpClientFilter.class); + + private final BeanContext beanContext; + private final Map clientConfigurationByName; + + ClientCredentialsTokenPropagator defaultTokenPropagator; + private final Map tokenPropagatorByName; + private final Map clientCredentialsClientByName; + + public final Map authorizationsByName; + + public AuthorizationFilter( + BeanContext beanContext, + Stream clientConfigurations, + ClientCredentialsTokenPropagator defaultTokenPropagator, + Stream configurableAuthorizations + ) { + this.beanContext = beanContext; + this.clientConfigurationByName = clientConfigurations + .filter(Toggleable::isEnabled) + .collect(Collectors.toMap(OauthClientConfiguration::getName, v -> v)); + this.defaultTokenPropagator = defaultTokenPropagator; + this.tokenPropagatorByName = new HashMap<>(); + this.clientCredentialsClientByName = new HashMap<>(); + this.authorizationsByName = configurableAuthorizations + .collect(Collectors.toMap(ConfigurableAuthorization::getName, v -> v)); + } + + @Override + public Publisher> doFilter( + @NonNull MutableHttpRequest request, + @NonNull ClientFilterChain chain + ) { + List names = request.getAttribute(AuthorizationBinder.AUTHORIZATION_NAMES, List.class).orElse(null); + if (CollectionUtils.isNotEmpty(names)) { + List> authorizers = new ArrayList<>(names.size()); + + for (Object nameObject: names) { + if (!(nameObject instanceof String)) { + continue; + } + String name = (String) nameObject; + + // Check if other authorizations have the key + if (authorizationsByName.containsKey(name)) { + ConfigurableAuthorization authorizer = authorizationsByName.get(name); + authorizers.add(Mono.fromCallable(() -> { + authorizer.applyAuthorization(request); + return request; + })); + continue; + } + + // Perform OAuth authorization + OauthClientConfiguration clientConfiguration = clientConfigurationByName.get(name); + if (clientConfiguration == null) { + continue; + } + + ClientCredentialsClient clientCredentialsClient = getClientCredentialsClient(name); + if (clientCredentialsClient == null) { + if (LOG.isTraceEnabled()) { + LOG.trace("Could not retrieve client credentials client for OAuth 2.0 client {}", name); + } + continue; + } + + ClientCredentialsTokenPropagator tokenHandler = getTokenPropagator(name); + Flux authorizer = Flux.from(clientCredentialsClient + .requestToken(getScope(clientConfiguration))) + .map(TokenResponse::getAccessToken) + .map(accessToken -> { + if (StringUtils.isNotEmpty(accessToken)) { + tokenHandler.writeToken(request, accessToken); + } + return request; + }); + authorizers.add(authorizer); + } + + return Flux.concat(authorizers) + .switchMap(v -> chain.proceed(request)); + } + + + return chain.proceed(request); + } + + protected ClientCredentialsTokenPropagator getTokenPropagator(String name) { + ClientCredentialsTokenPropagator tokenPropagator = tokenPropagatorByName.get(name); + if (tokenPropagator == null) { + tokenPropagator = beanContext.findBean(ClientCredentialsTokenPropagator.class, Qualifiers.byName(name)) + .orElse(defaultTokenPropagator); + if (tokenPropagator != null) { + tokenPropagatorByName.put(name, tokenPropagator); + } + } + return tokenPropagator; + } + + protected ClientCredentialsClient getClientCredentialsClient(String name) { + ClientCredentialsClient client = clientCredentialsClientByName.get(name); + if (client == null) { + client = beanContext.findBean(ClientCredentialsClient.class, Qualifiers.byName(name)).orElse(null); + if (client != null) { + clientCredentialsClientByName.put(name, client); + } + } + return client; + } + + @Nullable + protected String getScope(@NonNull OauthClientConfiguration oauthClient) { + return oauthClient.getClientCredentials().flatMap(ClientCredentialsConfiguration::getScope).orElse(null); + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorizations.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorizations.mustache new file mode 100644 index 00000000000..1ee37c7c1df --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/Authorizations.mustache @@ -0,0 +1,21 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth; + +import io.micronaut.core.bind.annotation.Bindable; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@Documented +@Retention(RUNTIME) +@Target(METHOD) +@Bindable +public @interface Authorizations { + Authorization[] value(); +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ApiKeyAuthConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ApiKeyAuthConfiguration.mustache new file mode 100644 index 00000000000..969da02fabc --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ApiKeyAuthConfiguration.mustache @@ -0,0 +1,79 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth.configuration; + +import io.micronaut.context.annotation.ConfigurationInject; +import io.micronaut.context.annotation.EachProperty; +import io.micronaut.context.annotation.Parameter; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.cookie.Cookie; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@EachProperty("security.api-key-auth") +public class ApiKeyAuthConfiguration implements ConfigurableAuthorization { + private final String name; + private AuthKeyLocation location; + private String paramName; + private String apiKey; + + @ConfigurationInject + public ApiKeyAuthConfiguration( + @Parameter String name, + @NonNull AuthKeyLocation location, + @NonNull String paramName, + @NonNull String apiKey + ) { + this.name = name; + this.location = location; + this.paramName = paramName; + this.apiKey = apiKey; + } + + @Override + public void applyAuthorization(@NonNull MutableHttpRequest request) { + if (this.location == AuthKeyLocation.HEADER) { + request.header(this.paramName, this.apiKey); + } else if (this.location == AuthKeyLocation.QUERY) { + request.getParameters().add(this.paramName, this.apiKey); + } else if (this.location == AuthKeyLocation.COOKIE) { + request.cookie(Cookie.of(this.paramName, this.apiKey)); + } + } + + @Override + public String getName() { + return name; + } + + public AuthKeyLocation getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setLocation(AuthKeyLocation location) { + this.location = location; + } + + public void setParamName(String paramName) { + this.paramName = paramName; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public enum AuthKeyLocation { + HEADER, + QUERY, + COOKIE; + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ConfigurableAuthorization.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ConfigurableAuthorization.mustache new file mode 100644 index 00000000000..2d649c3a3be --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/ConfigurableAuthorization.mustache @@ -0,0 +1,14 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth.configuration; + +import io.micronaut.core.annotation.NonNull; +import io.micronaut.http.MutableHttpRequest; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +public interface ConfigurableAuthorization { + String getName(); + + void applyAuthorization(@NonNull MutableHttpRequest request); +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/HttpBasicAuthConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/HttpBasicAuthConfiguration.mustache new file mode 100644 index 00000000000..189613b4f7e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/auth/configuration/HttpBasicAuthConfiguration.mustache @@ -0,0 +1,55 @@ +{{>licenseInfo}} +package {{invokerPackage}}.auth.configuration; + +import io.micronaut.context.annotation.ConfigurationInject; +import io.micronaut.context.annotation.EachProperty; +import io.micronaut.context.annotation.Parameter; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.http.MutableHttpRequest; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@EachProperty("security.basic-auth") +public class HttpBasicAuthConfiguration implements ConfigurableAuthorization { + private final String name; + private String username; + private String password; + + @ConfigurationInject + public HttpBasicAuthConfiguration( + @Parameter String name, + @NonNull String username, + @NonNull String password + ) { + this.name = name; + this.username = username; + this.password = password; + } + + @Override + public void applyAuthorization(@NonNull MutableHttpRequest request) { + request.basicAuth(username, password); + } + + @Override + public String getName() { + return this.name; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/Application.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/Application.mustache new file mode 100644 index 00000000000..ad59c5fa124 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/Application.mustache @@ -0,0 +1,9 @@ +package {{invokerPackage}}; + +import io.micronaut.runtime.Micronaut; + +public class Application { + public static void main(String[] args) { + Micronaut.run(Application.class, args); + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/application.yml.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/application.yml.mustache new file mode 100644 index 00000000000..4b0dd5f1c23 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/application.yml.mustache @@ -0,0 +1,62 @@ +base-path: "{{{basePath}}}" +context-path: "{{{contextPath}}}" + +micronaut: + application: + name: {{artifactId}} + {{! + configure authorization from the parameters + }}{{#configureAuth}}security: + oauth2: + clients:{{#oauthMethods}} + {{{name}}}: + grant-type: {{#isCode}}authorization_code{{/isCode}}{{#isImplicit}}implicit{{/isImplicit}}{{#isPassword}}password{{/isPassword}}{{#isApplication}}client_credentials{{/isApplication}} + scopes: [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}]{{!authorization url}}{{#authorizationUrl}} + authorization: + url: "{{{authorizationUrl}}}"{{/authorizationUrl}}{{!token url}}{{#tokenUrl}} + token: + auth-method: client_secret_basic + url: "{{{tokenUrl}}}"{{/tokenUrl}}{{!refreshUrl is not used}} + # TODO Fill in the parameters for {{{name}}} authorization if needed + # client-id: + # client-secret:{{/oauthMethods}}{{/configureAuth}}{{! + do not configure authorization, but leave hints for user + }}{{^configureAuth}}# TODO configure security features + security: + oauth2: + clients: + # An example of how oauth client is filled + # name: + # grant-type: authorization_code | client_credentials + # scopes: [] + # token: + # auth-method: client_secret_basic + # url: "https://" + # client-id: + # client-secret + # An example of how to apply other authorization methods + # authentication: bearer | cookie | session{{/configureAuth}} + +{{#configureAuth}}security: + {{!api key authorization}}api-key-auth:{{#authMethods}}{{#isApiKey}} + {{{name}}}: + location: {{#isKeyInQuery}}query{{/isKeyInQuery}}{{#isKeyInHeader}}header{{/isKeyInHeader}}{{#isKeyInCookie}}cookie{{/isKeyInCookie}} + param-name: "{{{keyParamName}}}" + # TODO fill in api key for {{{name}}} authorization + api-key: + {{/isApiKey}}{{/authMethods}} + {{!basic authorization}}basic-auth:{{#authMethods}}{{#isBasic}} + {{{name}}}: + # TODO fill in credentials for {{{name}}} authorization + username: + password: + {{/isBasic}}{{/authMethods}}{{/configureAuth}} + +jackson: + serialization: + writeEnumsUsingToString: true + writeDatesAsTimestamps: false + deserialization: + readEnumsUsingToString: true + failOnUnknownProperties: false + failOnInvalidSubtype: false diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/git_push.sh.mustache new file mode 100644 index 00000000000..8b3f689c912 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/git_push.sh.mustache @@ -0,0 +1,58 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="{{{gitHost}}}" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="{{{gitUserId}}}" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="{{{gitRepoId}}}" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="{{{releaseNote}}}" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=`git remote` +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' + diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/gitignore.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/gitignore.mustache new file mode 100644 index 00000000000..a530464afa1 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/git/gitignore.mustache @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/build.gradle.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/build.gradle.mustache new file mode 100644 index 00000000000..a654fe37133 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/build.gradle.mustache @@ -0,0 +1,51 @@ +plugins { + {{#isTestSpock}} + id("groovy") + {{/isTestSpock}} + id("com.github.johnrengelman.shadow") version "7.0.0" + id("io.micronaut.application") version "2.0.3" +} + +version = "{{artifactVersion}}" +group = "{{invokerPackage}}" + +repositories { + mavenCentral() +} + +micronaut { + runtime("netty") + {{#isTestSpock}} + testRuntime("spock2") + {{/isTestSpock}} + {{#isTestJunit}} + testRuntime("junit5") + {{/isTestJunit}} + processing { + incremental(true) + annotations("{{invokerPackage}}.*") + } +} + + +dependencies { + annotationProcessor("io.micronaut:micronaut-http-validation") + annotationProcessor("io.micronaut.security:micronaut-security-annotations") + implementation("io.micronaut:micronaut-http-client") + implementation("io.micronaut:micronaut-runtime") + implementation("io.micronaut:micronaut-validation") + implementation("io.micronaut.security:micronaut-security") + implementation("io.micronaut.security:micronaut-security-oauth2") + implementation("io.micronaut.reactor:micronaut-reactor") + implementation("io.swagger:swagger-annotations:1.5.9") + runtimeOnly("ch.qos.logback:logback-classic") +} + +// TODO Set the main class +application { + mainClass.set("{{invokerPackage}}.Application") +} +java { + sourceCompatibility = JavaVersion.toVersion("1.8") + targetCompatibility = JavaVersion.toVersion("1.8") +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/gradle.properties.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/gradle.properties.mustache new file mode 100644 index 00000000000..4804e049014 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/gradle.properties.mustache @@ -0,0 +1 @@ +micronautVersion=3.0.0-M5 \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/settings.gradle.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/settings.gradle.mustache new file mode 100644 index 00000000000..b8fd6c4c41f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradle/settings.gradle.mustache @@ -0,0 +1 @@ +rootProject.name = "{{artifactId}}" \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.jar b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.properties.mustache new file mode 100644 index 00000000000..f2e1eb1fd47 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradle-wrapper.properties.mustache @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.bat.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.bat.mustache new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.bat.mustache @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.mustache new file mode 100644 index 00000000000..4f906e0c811 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/gradlew/gradlew.mustache @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/MavenWrapperDownloader.java.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/MavenWrapperDownloader.java.mustache new file mode 100644 index 00000000000..fc435c409b3 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/MavenWrapperDownloader.java.mustache @@ -0,0 +1,124 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.Authenticator; +import java.net.PasswordAuthentication; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.jar.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.jar.mustache new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^ z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN} zXvC<tOmX83grD8GSo_Lo?%lNfhD#EBgPo z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c> zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$UPDeE_53j${QfKN-0v-HG z(QfyvFNbwPK%^!eIo4ac1;b>c0vyf9}Xby@YY!lkz-UvNp zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^1?H1om1de0Da9M;Q=n zUfn{f87iVb^>Exl*nZ0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7 ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL%u9i`DSM4RdtEH#cW)6}+I-eE< z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI} zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83 zJL7+ncjI9nn!TlS_KYu5vn%f*@qa5F;| zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$ zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~ z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;; z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i z{|Zd9ou-;laGS_x=O}a+ zB||za<795A?_~Q=r=coQ+ZK@@ zId~hWQL<%)fI_WDIX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{ zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2 z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9 zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$>Ed%` z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ} z(||hyyQ)4Z1@wSlT94(-QKqkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5 zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9 z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s> ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2 zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|j>^Qf`A76K%_ubL`Zu?h4`b=IyL>1!=*%!_K)=XC z6d}4R5L+sI50Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I# zlTFFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC& zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$ zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_X%Rl1&Kd~Z(u z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0 z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+ zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl zib0v*{u-?cq}dDGyZ%$XRY=UkQwt2oGu`zQneZh$=^! zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(TpBs; zg$25D!Ry_`8xpS_OJdeo$qh#7U+cepZ??TII7_%AXsT$B z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr zJvD*y6;39&T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m z#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9 zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_ z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu; zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1 z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV zP8^KGZnp`(hVMZ;s=n~3r2y;LTwcJwoBW-(ndU-$03{RD zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx! zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&K zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l z*TYQn^NnUy%Ds}$f^=yQ+BM-a5X4^GHF=%PDrRfm_uqC zh{sKwIu|O0&jWb27;wzg4w5uA@TO_j(1X?8E>5Zfma|Ly7Bklq|s z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE) zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wTyl3!M1q+a zD9W{pCd%il*j&Ft z5H$nENf>>k$;SONGW`qo6`&qKs*T z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==Iu%}HvNliOqVBqG?P2va zQ;kRJ$J6j;+wP9cS za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+MmiaP-eq6_k;)i6_@WSJ zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9 z>&=i7*#tc0`?!==vk>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;< z+bhAbVD*bD=}iU`+PU+SBobTQ%S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8 zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp zF9#myUmO!wCeJIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY z&-&T{egB)&aV$3_aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc zRI+7g2V&k zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#? zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6 zWG18WJaPKMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY? zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IOk=y$dOls{6sRR`I5>|X zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1 zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^ z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC92|Sy0%WWWp={$(am!#l~f^W_oz78HX<0X#7 zp)p1u~M*o9W@O8P{0Qkg@Wa# z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@ zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5 z1^T^eB{_)Y<9)y{-4Rz@9_>;_7h;5D+@QcbF4Wv7hu)s0&==&6u)33 zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj= zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq z6lc*mvU=WS6=v9Lrl}&zRiu_6u;6g%_DU{9b+R z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBFKhx z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wfy?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w zOFTI8gX$ard6fAh&g=u&56%3^-6E2tpk*wx3HSCQ+t7+*iOs zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen- zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r zD?|MetfhdC;^2WG`7MCgs>TKKN=^=!x&Q~BzmQio_^l~LboTNT=I zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V? z;H2SbF>jP^GE(R1@%C==XQ@J=G9lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5dMe+*Gomky_l^54*rzXro$ z>LL)U5Ry>~FJi=*{JDc)_**c)-&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9 zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6 zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qodn#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{ z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(DfinaaWxP<+Y97Z#n#U~V zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L zWjo4l%n51@Kz-n%zeSCD`uB?T%FVk+KBI}=ve zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9 z35uzIrIuo4#WnF^_jcpC@uNNaYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T zAuQ6RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf; zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@ z$FU-;e4W}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*83l9mI zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW zmhHUxd)t%GQ9#ak5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu# zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK zLs>UtkT43LR2G$AOYHVailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB! zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJeTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d> z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec zo<1dyhsVsTw;ZkVcJ_0-h-T3G1W@q)_Q30LNv)W?FbMH+XJ* zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9 zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~* z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgBY_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7>C2m=oghKyxMbFNq#EVLgP0cH3q7H z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_ zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB! z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$ zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$ z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi# zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7RaRnH0Rc_&372={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G z70u6}?zmd?v+{`vCu-53_v5@z)X{oPC@P)iA3jK$`r zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5Ay`RLfY(EiwKkrx%@YN^^XuET;tE zmr-6~I7j!R!KrHu5CWGSChO6deaLWa*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p}O?7`}i7Lsf$-gBkuY*`Zb z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40 zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD~pMgq^KY)T*aBz@DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7 z?^XN}Gf_feGoG~BjUgVa*)O`>lX=$BSR2)uD<9 z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6v$6gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp z@tFGi*CQ~@Yc-?{cwu1 zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm zOxt~Rb3D{dz=nHMcY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb zq6hBGp%O1A+&%2>l0mpaIzbo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5PIso9j1;e zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8 z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R% zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid z9U$XVqxX3P=XCKj0*W>}L0~Em`(vG<>srF8+*kPrw z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#CVjzUZ z!sD2O*;d28zkl))m)YN7HDi^z5IuNo3^w(zy8 zszJG#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=|KshybNB6HgE^(r>HD{*}S}mO>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0 zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(Wlay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_ z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7 zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{ z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_ z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F} zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xUOL2 zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J-> z`(mzDJDM}QPu5i44**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~ zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8 zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD? zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq( z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEyPMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8 zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43? z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz! zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb| zY_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq;ul_ z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQr>3@wA;{EUbjNjlNd6$Mx zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu z2?^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*> z7MQgk6t9OqqXMln?zoMAJcc zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70 zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwfPO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp z4{I|}35=11u$;?|JFBEE*gb;T`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3? zWi-RoXhzRJV0&XE@ACc?+@6?)LQ2XNm4KfalMtsc%4!Fn0rl zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH> z{o!A7f;R-@eK9Vj7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367 zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~ zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435 z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tSOowM{BX@(zawtjl zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7 zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<- zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5ft)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4 zLK<69qcUuniIan-$A1+fR=?@+thwDIXtF1Tks@Br-xY zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!ZRPX`(ZkRGe7~q(4&gEi<$ch`5kQ?*1=GSqkeV z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T zw9p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$ zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{ zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*yONhZG=onhx>t4)RB`r6&TP$n zgmN*)eCqvgriBO-abHQ8ECN0bw?z5Bxpx z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg ziUbIFW#2tj`65~#2V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-j*+=--XGvCq#32Gh(=|qj5F?kmihk{%M&$}udW5)DHK zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{ zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_( zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT# zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O z15y^{4tQoeW9Lu%G&V$90x6F)xN6y_oIn;!Q zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~ zUpeyt7}_nd`t}j9BKqryOha{34erm)RmST)_9Aw)@ zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps|| z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez> zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(@VB)zweR%?IidwJyK5J!STzw&2RFx zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gVhkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_ zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U# ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH7qN}%PKcN|8%9=i)qS5+$L zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW zi7A5Wym*K+V8pkqqO-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~ zp0YJ_P~_a8j= zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x zLW(l}oAg1H`dU+Fv**;qw|ANDSRs>cGqL!Yw^`; zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14 zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55Xy|Kps&Xek*4_r=KDZ z+`TQuv|$l}MWLzA5Ay6Cvsa^7xvwXpy?`w(6vx4XJ zWuf1bVSb#U8{xlY4+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0hn>KZ+h-3=?Y3*R=#!fOX zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy- z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^ zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup zVTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0 zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l> zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G} z2XfmT0(|l!)XJb^E!#3z4oEGIsL(xd; zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1eYtUL9B72{i(ir&ls8g!pD ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)% z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q zMMdd$fH|!s{ zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b z8?9h)kvj9SF!Dr zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?BYlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6 z?sV;|?*=-{M<1+hXoj?@-$y+(^BJ1H~wQ9G8C0#^aEAyhDduNX@haoa=PuPp zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@ z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9 z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`># zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg` z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_x=E1h>T5`DPHz zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i z5>Q(o z=t$gPjgGh0&I7KY#k50V7DJRX<%^X z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-GDY(YkR{9RH(MiCnyRtd!LxXJ75z+?2 zGi@m^+2hKJ5sB1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6 zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY% zOL=GE_ENYxhcyUrEt9XlMNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+ zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQvH~d`MQs86R$|SKXHh zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R; zsUNJf&g&rKpuD0WD@=dDrPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl zrw3Sp151^9=}B})6@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2 zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv)NtmC zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{ zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi% zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@|htC z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM% zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J z^ww~c;ou|iyzpErDtlVU=`8N7JSu>4M z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN; z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~fB zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt* z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q>H_M=fM*L_Op-<_r zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92 zsS&FH(*w`qLIy$doc>RE&A5R?u zzkl1sxX|{*fLpXvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_d7%NEFP6+ zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4- zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z)=5k2tG zM|&Bp5kDTfb#vfuTTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7 zb?A-RKVm_vM5!9?C%qYdfRAw& zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6 z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-# zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-ykqrK?WWZ#a(bglI_-8pq74RK*KfQ z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~ zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1 zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@ z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxomG1#XPmn(?YH@E~_ED+W6mxs%x{%Z<$pW`~ON1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy zOgb-=f}|Hb*LQ$YdWg<(u7x3`PKF)B7ZfZ6;1FrNM63 z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{ zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^I>#vh+LyC;aaVWGbmkENr z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yoO@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^ zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^ z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6& zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1DsOrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhIM0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X% z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~( zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky! zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k zBi=6wE5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)LPvhyN3i4goB$3K8iV7uh zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUYkI9T1cEF;ObfxxI-yNuA=I$dCtz3ey znVkctYD*`fUuZ(57+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@ z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u zm_~}T{HeHj1bAlKl8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4 z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z) zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9% znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O zP%xrP1M6@oYhgo$ZWwrAsYLa4 z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@< zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)woZp~> zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD zc;i;KS+t$koh)E3)w0OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk# zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+niZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^ zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w< zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7 ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I zAL+3opNhJteu&mWQ@kQWPucmiP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5 zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{ zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^ z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3 zO5a`6gwFw(moEzqxh=yJ9M1FTn!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm z%RSLc#p}5_dO{GD=DEFr=Fc% z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;# zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~ zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN#z`nI{UNDRbo-wqa4NEls zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao zUq=TaL$P*IFgJzrGc>j1dDOd zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-f@s?^tmzs_j7t!k zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl- zGd|Cv~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7 zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$ z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q& z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5tK8a+thWE zg4VytZrwcS?7^ zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_ z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^aYa{~m%5#$$+R1? zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI_N*#MMCIq#HFifT zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5 zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$XG8$(&{A zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^2Z)SWo+b`y0gV^iRcZtz5!-05vF z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_ z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s= z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?NI z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P z5gTIzl{3!&(tor^BwZfR8j4k{7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3 zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2 z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+o$@nun`VI1Er7pjq>8V zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d z6h>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4 zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;ZXkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8 z221?Va!l1|Y5X1Y?{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt zA{CcxZLJR|4#{j7k~Tu*jkwz8QA|5G1$Cl895R`Zyp;irp1{KN){kB30O8P1W5;@bG znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2> z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;) z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kDfpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}u3d|eQ8*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo> ze9KdJoiM)RH*SB%^;TAdX-zEjA7@%y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+ zOwDhFvA(E|ER%a^cdh@^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh` zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm zAO&Im2flv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2 zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRDnf1gP{#2>`ffrAC% zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~ zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m( zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM z-{1Wm&p%%#eb_?x7i;bol EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.properties.mustache new file mode 100644 index 00000000000..642d572ce90 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/maven-wrapper.properties.mustache @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.bat.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.bat.mustache new file mode 100644 index 00000000000..c8d43372c98 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.bat.mustache @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.mustache new file mode 100644 index 00000000000..a16b5431b4c --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/mavenw/mvnw.mustache @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/pom.xml.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/pom.xml.mustache new file mode 100644 index 00000000000..3ef1c44ab3e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/configuration/pom.xml.mustache @@ -0,0 +1,195 @@ + + + 4.0.0 + {{groupId}} + {{artifactId}} + {{artifactVersion}} + ${packaging} + + + io.micronaut + micronaut-parent + 3.0.0-M5 + + + + jar + 1.8 + + + 3.0.0-M5 + {{groupId}}.Application + netty + 1.5.21 + + + + + central + https://repo.maven.apache.org/maven2 + + + + + + io.micronaut + micronaut-inject + compile + + + io.micronaut + micronaut-validation + compile + + {{#isTestSpock}} + + io.micronaut + micronaut-inject-groovy + test + + + org.spockframework + spock-core + test + + + org.codehaus.groovy + groovy-all + + + + + io.micronaut.test + micronaut-test-spock + test + + {{/isTestSpock}} + {{#isTestJunit}} + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + io.micronaut.test + micronaut-test-junit5 + test + + {{/isTestJunit}} + + io.micronaut + micronaut-http-client + compile + + + io.micronaut + micronaut-http-server-netty + compile + + + io.micronaut + micronaut-runtime + compile + + + io.micronaut.reactor + micronaut-reactor + compile + + + io.micronaut.security + micronaut-security + compile + + + io.micronaut.security + micronaut-security-oauth2 + compile + + + ch.qos.logback + logback-classic + runtime + + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + + + + + + io.micronaut.build + micronaut-maven-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + io.micronaut + micronaut-http-validation + ${micronaut.version} + + + io.micronaut.security + micronaut-security-annotations + ${micronaut.security.version} + + + + -Amicronaut.processing.group={{groupId}} + -Amicronaut.processing.module={{artifactId}} + + + + {{#isTestSpock}} + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Spec.* + **/*Test.* + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.9.0 + + + + addSources + generateStubs + compile + removeStubs + addTestSources + generateTestStubs + compileTests + removeTestStubs + + + + + {{/isTestSpock}} + + + + diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/README.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/README.mustache new file mode 100644 index 00000000000..96a3428b659 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/README.mustache @@ -0,0 +1,39 @@ +# {{artifactId}} + +This is a generated client based on [Micronaut](https://micronaut.io/) framework. + +## Configuration + +A Micronaut's application can be created by defyning a main class and running: +```java +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; + +public class Application { + + public static void main(String[] args) { + ApplicationContext context = Micronaut.run(Application.class); + } +} +``` + +More detailed description can be found in the [Micronaut Guide](https://docs.micronaut.io/latest/guide/#ideSetup). + +All the properties can be changed in the [application.yml][src/main/resources/application.yml] file or when creating micronaut application as described in [Configuration section of guide](https://docs.micronaut.io/latest/guide/#config). + +## Api Guides + +Description on how to create Apis is given inside individual api guides: + +{{#apiInfo}}{{#apis}}* [{{classFilename}}]({{apiDocPath}}/{{classFilename}}.md) +{{/apis}}{{/apiInfo}} + +## Auth methods + +Details on auth methods can be found in the [auth.md](doc/auth.md). + +## Author + +{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}} +{{/hasMore}}{{/apis}}{{/apiInfo}} + diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/api_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/api_doc.mustache new file mode 100644 index 00000000000..92170fc6dbb --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/api_doc.mustache @@ -0,0 +1,68 @@ +# {{classname}}{{#description}} +{{description}}{{/description}} + +All URIs are relative to *{{basePath}}* + +Method | HTTP request | Description +------------- | ------------- | ------------- +{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}} +{{/operation}}{{/operations}} + +## Creating {{classname}} + +To initiate an instance of `{{classname}}`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import {{package}}.{{classname}}; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean({{classname}}.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + {{classname}} {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + +{{#operations}} +{{#operation}} + +# **{{operationId}}** +```java +{{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono{{/returnType}} {{classname}}.{{nickname}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) +``` + +{{summary}}{{#notes}} + +{{notes}}{{/notes}} + +{{#allParams}}{{#-last}}### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- +{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}`{{dataType}}`{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}`{{dataType}}`{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional parameter]{{/required}}{{#defaultValue}} [default to `{{defaultValue}}`]{{/defaultValue}}{{#allowableValues}} [enum: {{#values}}`{{{.}}}`{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}} +{{/allParams}}{{/-last}}{{/allParams}} + +{{#returnType}}### Return type +{{#returnTypeIsPrimitive}}`{{returnType}}`{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}} + +{{#authMethods}}{{#-last}}### Authorization{{#authMethods}} +* **[{{name}}](auth.md#{{name}})**{{#scopes}}{{#-last}}, scopes: {{#scopes}}`{{{scope}}}`{{^-last}}, {{/-last}}{{/scopes}}{{/-last}}{{/scopes}}{{/authMethods}}{{/-last}}{{/authMethods}} + +### HTTP request headers + - **Content-Type**: {{#consumes}}`{{{mediaType}}}`{{^-last}}, {{/-last}}{{/consumes}}{{^consumes}}Not defined{{/consumes}} + - **Accept**: {{#produces}}`{{{mediaType}}}`{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}} + +{{/operation}} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/auth.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/auth.mustache new file mode 100644 index 00000000000..9c5ba683fb7 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/auth.mustache @@ -0,0 +1,25 @@ +# Authorization methods +{{#authMethods}} + +# {{name}} +{{! + basic auth +}}{{#isBasic}}Authorization method is of **basic auth**. + +{{#configureAuth}}The configuration for it can be found in [application.yml](src/main/resources/application.yml) at `security.basic-auth.{{name}}`. `username` and `password` need to be filled for it to work correctly.{{/configureAuth}}{{^configureAuth}}It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features.{{/configureAuth}} +{{/isBasic}}{{! + api key +}}{{#isApiKey}}Authorization method is of **api key type**. The parameter `{{{keyParamName}}}` is located in `{{#isKeyInQuery}}query{{/isKeyInQuery}}{{#isKeyInHeader}}header{{/isKeyInHeader}}{{#isKeyInCookie}}cookie{{/isKeyInCookie}}`. + +{{#configureAuth}}The configuration for it can be found in [application.yml](src/main/resources/application.yml) at `security.api-key-auth.{{name}}`. The `api-key` parameter needs to be filled in order for it to work correctly.{{/configureAuth}}{{^configureAuth}}It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features.{{/configureAuth}} +{{/isApiKey}}{{! + oauth +}}{{#isOAuth}}Authorization method is **OAuth2** with `{{flow}}` flow. +{{!scopes}}{{#scopes}}{{#-last}}The scopes are: {{#scopes}} + * `{{{scope}}}`{{/scopes}}{{/-last}}{{/scopes}} + +{{#configureAuth}}The configuration for it can be found in [application.yml](src/main/resources/application.yml) at `micronaut.security.oauth2.clients.{{name}}`. Some parameters may require to be filled in for it to work correctly.{{/configureAuth}}{{^configureAuth}}It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features.{{/configureAuth}} + +More information on configuring can be found in [Micronaut Security Guide](https://micronaut-projects.github.io/micronaut-security/latest/guide/#oauth). +{{/isOAuth}} +{{/authMethods}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/enum_outer_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/enum_outer_doc.mustache new file mode 100644 index 00000000000..20c512aaeae --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/enum_outer_doc.mustache @@ -0,0 +1,7 @@ +# {{classname}} + +## Enum + +{{#allowableValues}}{{#enumVars}} +* `{{name}}` (value: `{{{value}}}`) +{{/enumVars}}{{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/model_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/model_doc.mustache new file mode 100644 index 00000000000..3f14f653581 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/model_doc.mustache @@ -0,0 +1,4 @@ +{{#models}}{{#model}} + +{{#isEnum}}{{>doc/enum_outer_doc}}{{/isEnum}}{{^isEnum}}{{>doc/pojo_doc}}{{/isEnum}} +{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/pojo_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/pojo_doc.mustache new file mode 100644 index 00000000000..0a79703d7a0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/doc/pojo_doc.mustache @@ -0,0 +1,39 @@ +# {{#vendorExtensions.x-is-one-of-interface}}Interface {{/vendorExtensions.x-is-one-of-interface}}{{classname}} + +{{#description}}{{&description}} +{{/description}} +{{^vendorExtensions.x-is-one-of-interface}} + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +{{#vars}}**{{name}}** | {{#isEnum}}[**{{datatypeWithEnum}}**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isContainer}}{{#isArray}}{{#items}}{{#isModel}}[{{/isModel}}{{/items}}`{{baseType}}{{#items}}<{{dataType}}>`{{#isModel}}]({{^baseType}}{{dataType}}{{/baseType}}{{#baseType}}{{baseType}}{{/baseType}}.md){{/isModel}}{{/items}}{{/isArray}}{{#isMap}}{{#items}}{{#isModel}}[{{/isModel}}`Map<String, {{dataType}}>`{{#isModel}}]({{^baseType}}{{dataType}}{{/baseType}}{{#baseType}}{{baseType}}{{/baseType}}.md){{/isModel}}{{/items}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{#isModel}}[{{/isModel}}`{{dataType}}`{{#isModel}}]({{^baseType}}{{dataType}}{{/baseType}}{{#baseType}}{{baseType}}{{/baseType}}.md){{/isModel}}{{/isContainer}}{{/isEnum}} | {{description}} | {{^required}} [optional property]{{/required}}{{#isReadOnly}} [readonly property]{{/isReadOnly}} +{{/vars}} + +{{#vars}}{{#isEnum}} + +## Enum: {{datatypeWithEnum}} + +Name | Value +---- | -----{{#allowableValues}}{{#enumVars}} +{{name}} | `{{value}}`{{/enumVars}}{{/allowableValues}} +{{/isEnum}}{{/vars}} + +{{#vendorExtensions.x-implements.0}} +## Implemented Interfaces + +{{#vendorExtensions.x-implements}} +* `{{{.}}}` +{{/vendorExtensions.x-implements}} +{{/vendorExtensions.x-implements.0}} +{{/vendorExtensions.x-is-one-of-interface}} + +{{#vendorExtensions.x-is-one-of-interface}} + +## Implementing Classes + +{{#oneOf}} +* `{{{.}}}` +{{/oneOf}} +{{/vendorExtensions.x-is-one-of-interface}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/generatedAnnotation.mustache new file mode 100644 index 00000000000..98fbb9f7da9 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/generatedAnnotation.mustache @@ -0,0 +1 @@ +@Generated(value="{{generatorClass}}"{{^hideGenerationTimestamp}}, date="{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/licenseInfo.mustache new file mode 100644 index 00000000000..abc2f4578eb --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/licenseInfo.mustache @@ -0,0 +1,11 @@ +/* + * {{{appName}}} + * {{{appDescription}}} + * + * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}} + * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}} + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/beanValidation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/beanValidation.mustache new file mode 100644 index 00000000000..bbc797247ea --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/beanValidation.mustache @@ -0,0 +1,52 @@ +{{#useBeanValidation}}{{! +validate all pojos and enums +}}{{^isContainer}}{{#isModel}} @Valid +{{/isModel}}{{/isContainer}}{{! +nullable & nonnull +}}{{#required}}{{#isNullable}} @Nullable +{{/isNullable}}{{^isNullable}} @NotNull +{{/isNullable}}{{/required}}{{^required}} @Nullable +{{/required}}{{! +pattern +}}{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}") +{{/isByteArray}}{{/pattern}}{{! +both minLength && maxLength +}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}}, max={{maxLength}}) +{{/maxLength}}{{/minLength}}{{! +just minLength +}}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}) +{{/maxLength}}{{/minLength}}{{! +just maxLength +}}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}) +{{/maxLength}}{{/minLength}}{{! +@Size: both minItems && maxItems +}}{{#minItems}}{{#maxItems}} @Size(min={{minItems}}, max={{maxItems}}) +{{/maxItems}}{{/minItems}}{{! +@Size: just minItems +}}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}) +{{/maxItems}}{{/minItems}}{{! +@Size: just maxItems +}}{{^minItems}}{{#maxItems}} @Size(max={{maxItems}}) +{{/maxItems}}{{/minItems}}{{! +@Email +}}{{#isEmail}} @Email +{{/isEmail}}{{! +check for integer or long / all others=decimal type with @Decimal* +isInteger set +}}{{#isInteger}}{{#minimum}} @Min({{minimum}}) +{{/minimum}}{{#maximum}} @Max({{maximum}}) +{{/maximum}}{{/isInteger}}{{! +isLong set +}}{{#isLong}}{{#minimum}} @Min({{minimum}}L) +{{/minimum}}{{#maximum}} @Max({{maximum}}L) +{{/maximum}}{{/isLong}}{{! +Not Integer, not Long => we have a decimal value! +}}{{^isInteger}}{{^isLong}}{{! +minimum for decimal value +}}{{#minimum}} @DecimalMin({{#exclusiveMinimum}}value={{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive=false{{/exclusiveMinimum}}) +{{/minimum}}{{! +maximal for decimal value +}}{{#maximum}} @DecimalMax({{#exclusiveMaximum}}value={{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}) +{{/maximum}}{{! +close decimal values +}}{{/isLong}}{{/isInteger}}{{/useBeanValidation}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/jackson_annotations.mustache new file mode 100644 index 00000000000..b7f047ee540 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/jackson_annotations.mustache @@ -0,0 +1,26 @@ +{{! + If this is map and items are nullable, make sure that nulls are included. + To determine what JsonInclude.Include method to use, consider the following: + * If the field is required, always include it, even if it is null. + * Else use custom behaviour, IOW use whatever is defined on the object mapper + }} + @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}) + @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}}) + {{#withXml}} + {{^isContainer}} + @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") + @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") + {{/isContainer}} + {{#isContainer}} + {{#isXmlWrapped}} + // items.xmlName={{items.xmlName}} + @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}") + {{/isXmlWrapped}} + {{/isContainer}} + {{/withXml}} + {{#isDateTime}} + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + {{/isDateTime}} + {{#isDate}} + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + {{/isDate}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/model.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/model.mustache new file mode 100644 index 00000000000..d9bf0572982 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/model.mustache @@ -0,0 +1,48 @@ +{{>licenseInfo}} +package {{package}}; + +{{#useReflectionEqualsHashCode}} +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +{{/useReflectionEqualsHashCode}} +import java.util.Objects; +import java.util.Arrays; +{{#imports}} +import {{import}}; +{{/imports}} +{{#serializableModel}} +import java.io.Serializable; +{{/serializableModel}} +import com.fasterxml.jackson.annotation.*; +{{#withXml}} +import com.fasterxml.jackson.dataformat.xml.annotation.*; +import com.fasterxml.jackson.annotation.*; +{{/withXml}} +{{#withXml}} +import javax.xml.bind.annotation.*; +{{/withXml}} +{{#parcelableModel}} +import android.os.Parcelable; +import android.os.Parcel; +{{/parcelableModel}}{{#useBeanValidation}} +import javax.validation.constraints.*; +import javax.validation.Valid; +{{/useBeanValidation}} +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +{{#models}} + {{#model}} + {{#isEnum}} +{{>model/modelEnum}} + {{/isEnum}} + {{^isEnum}} + {{#vendorExtensions.x-is-one-of-interface}} +{{>model/oneof_interface}} + {{/vendorExtensions.x-is-one-of-interface}} + {{^vendorExtensions.x-is-one-of-interface}} +{{>model/pojo}} + {{/vendorExtensions.x-is-one-of-interface}} + {{/isEnum}} + {{/model}} +{{/models}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelEnum.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelEnum.mustache new file mode 100644 index 00000000000..3bb6622f08d --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelEnum.mustache @@ -0,0 +1,61 @@ +{{#jackson}} +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +{{/jackson}} + +/** + * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} + */ +{{#additionalEnumTypeAnnotations}} +{{{.}}} +{{/additionalEnumTypeAnnotations}}{{#useBeanValidation}}@Introspected +{{/useBeanValidation}}public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} { + {{#allowableValues}} + {{#enumVars}} + {{#enumDescription}} + /** + * {{enumDescription}} + */ + {{/enumDescription}} + {{#withXml}} + @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) + {{/withXml}} + {{{name}}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} + {{/enumVars}} + {{/allowableValues}} + + private {{{dataType}}} value; + + {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { + this.value = value; + } + + {{#jackson}} + @JsonValue + {{/jackson}} + public {{{dataType}}} getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + {{#jackson}} + @JsonCreator + {{/jackson}} + public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { + for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { + if (b.value.equals(value)) { + return b; + } + } + {{#isNullable}} + return null; + {{/isNullable}} + {{^isNullable}} + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + {{/isNullable}} + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelInnerEnum.mustache new file mode 100644 index 00000000000..cd49673d015 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/modelInnerEnum.mustache @@ -0,0 +1,60 @@ + /** + * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} + */ +{{#withXml}} + @XmlType(name="{{datatypeWithEnum}}") + @XmlEnum({{dataType}}.class) +{{/withXml}} +{{#additionalEnumTypeAnnotations}} + {{{.}}} +{{/additionalEnumTypeAnnotations}} + public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} { + {{#allowableValues}} + {{#enumVars}} + {{#enumDescription}} + /** + * {{enumDescription}} + */ + {{/enumDescription}} + {{#withXml}} + @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) + {{/withXml}} + {{{name}}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} + {{/enumVars}} + {{/allowableValues}} + + private {{{dataType}}} value; + + {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) { + this.value = value; + } + + {{#jackson}} + @JsonValue + {{/jackson}} + public {{{dataType}}} getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + {{#jackson}} + @JsonCreator + {{/jackson}} + public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { + for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { + if (b.value.equals(value)) { + return b; + } + } + {{#isNullable}} + return null; + {{/isNullable}} + {{^isNullable}} + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + {{/isNullable}} + } + } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/oneof_interface.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/oneof_interface.mustache new file mode 100644 index 00000000000..ca0a063d6d8 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/oneof_interface.mustache @@ -0,0 +1,9 @@ +{{#additionalModelTypeAnnotations}} +{{{.}}} +{{/additionalModelTypeAnnotations}} +{{>generatedAnnotation}}{{>model/typeInfoAnnotation}}{{>model/xmlAnnotation}} +public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} { + {{#discriminator}} + public {{propertyType}} {{propertyGetter}}(); + {{/discriminator}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/pojo.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/pojo.mustache new file mode 100644 index 00000000000..bcf8b1f1774 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/pojo.mustache @@ -0,0 +1,330 @@ +/** + * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} + */ +{{#description}} +@ApiModel(description = "{{{description}}}") +{{/description}} +{{#jackson}} +@JsonPropertyOrder({ + {{#vars}} + {{classname}}.JSON_PROPERTY_{{nameInSnakeCase}}{{^-last}},{{/-last}} + {{/vars}} +}) +@JsonTypeName("{{name}}") +{{/jackson}} +{{#additionalModelTypeAnnotations}} +{{{.}}} +{{/additionalModelTypeAnnotations}} +{{>generatedAnnotation}}{{#discriminator}}{{>model/typeInfoAnnotation}}{{/discriminator}}{{>model/xmlAnnotation}}{{#useBeanValidation}} +@Introspected +{{/useBeanValidation}}{{! +Declare the class with extends and implements +}}public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{ + {{#serializableModel}} + private static final long serialVersionUID = 1L; + + {{/serializableModel}} + {{#vars}} + {{#isEnum}} + {{^isContainer}} +{{>model/modelInnerEnum}} + {{/isContainer}} + {{#isContainer}} + {{#mostInnerItems}} +{{>model/modelInnerEnum}} + {{/mostInnerItems}} + {{/isContainer}} + {{/isEnum}} + public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}"; + {{#withXml}} + {{#isXmlAttribute}} + @XmlAttribute(name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}" + {{/isXmlAttribute}} + {{^isXmlAttribute}} + {{^isContainer}} + @XmlElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") + {{/isContainer}} + {{#isContainer}} + // Is a container wrapped={{isXmlWrapped}} + {{#items}} + // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}} + // items.example={{example}} items.type={{dataType}} + @XmlElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") + {{/items}} + {{#isXmlWrapped}} + @XmlElementWrapper({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") + {{/isXmlWrapped}} + {{/isContainer}} + {{/isXmlAttribute}} + {{/withXml}} + {{#vendorExtensions.x-is-jackson-optional-nullable}} + {{#isContainer}} + private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined(); + {{/isContainer}} + {{^isContainer}} + private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}}; + {{/isContainer}} + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + {{#isContainer}} + private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; + {{/isContainer}} + {{^isContainer}} + {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; + {{/isContainer}} + {{/vendorExtensions.x-is-jackson-optional-nullable}} + + {{/vars}} + {{#parcelableModel}} + public {{classname}}() { + {{#parent}} + super(); + {{/parent}} + } + + {{/parcelableModel}} + {{#vars}} + {{^isReadOnly}} + public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}}); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + this.{{name}} = {{name}}; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + return this; + } + + {{#isArray}} + public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + if (this.{{name}} == null || !this.{{name}}.isPresent()) { + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + } + try { + this.{{name}}.get().add({{name}}Item); + } catch (java.util.NoSuchElementException e) { + // this can never happen, as we make sure above that the value is present + } + return this; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + {{^required}} + if (this.{{name}} == null) { + this.{{name}} = {{{defaultValue}}}; + } + {{/required}} + this.{{name}}.add({{name}}Item); + return this; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + } + + {{/isArray}} + {{#isMap}} + public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + if (this.{{name}} == null || !this.{{name}}.isPresent()) { + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + } + try { + this.{{name}}.get().put(key, {{name}}Item); + } catch (java.util.NoSuchElementException e) { + // this can never happen, as we make sure above that the value is present + } + return this; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + {{^required}} + if (this.{{name}} == null) { + this.{{name}} = {{{defaultValue}}}; + } + {{/required}} + this.{{name}}.put(key, {{name}}Item); + return this; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + } + + {{/isMap}} + {{/isReadOnly}} + /** + {{#description}} + * {{description}} + {{/description}} + {{^description}} + * Get {{name}} + {{/description}} + {{#minimum}} + * minimum: {{minimum}} + {{/minimum}} + {{#maximum}} + * maximum: {{maximum}} + {{/maximum}} + * @return {{name}} + **/ +{{>model/beanValidation}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + {{#vendorExtensions.x-extra-annotation}} + {{{vendorExtensions.x-extra-annotation}}} + {{/vendorExtensions.x-extra-annotation}} + {{#vendorExtensions.x-is-jackson-optional-nullable}} +{{!unannotated, Jackson would pick this up automatically and add it *in addition* to the _JsonNullable getter field}} @JsonIgnore + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + {{#jackson}} +{{>model/jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}} public {{{datatypeWithEnum}}} {{getter}}() { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + {{#isReadOnly}} +{{! A readonly attribute doesn't have setter => jackson will set null directly if explicitly returned by API, so make sure we have an empty JsonNullable}} if ({{name}} == null) { + {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}}; + } + {{/isReadOnly}} + return {{name}}.orElse(null); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + return {{name}}; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + } + + {{#vendorExtensions.x-is-jackson-optional-nullable}} +{{>model/jackson_annotations}} + public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() { + return {{name}}; + } + + @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}) + {{#isReadOnly}}private{{/isReadOnly}}{{^isReadOnly}}public{{/isReadOnly}} void {{setter}}_JsonNullable(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) { + {{! For getters/setters that have name differing from attribute name, we must include setter (albeit private) for jackson to be able to set the attribute}} this.{{name}} = {{name}}; + } + + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^isReadOnly}} + {{#jackson}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} +{{>model/jackson_annotations}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/jackson}} public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}}); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + this.{{name}} = {{name}}; + {{/vendorExtensions.x-is-jackson-optional-nullable}} + } + + {{/isReadOnly}} + {{/vars}} + @Override + public boolean equals(Object o) { + {{#useReflectionEqualsHashCode}} + return EqualsBuilder.reflectionEquals(this, o, false, null, true); + {{/useReflectionEqualsHashCode}} + {{^useReflectionEqualsHashCode}} + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + {{#hasVars}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && + {{/-last}}{{/vars}}{{#parent}} && + super.equals(o){{/parent}}; + {{/hasVars}} + {{^hasVars}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}}; + {{/hasVars}} + {{/useReflectionEqualsHashCode}} + } + + @Override + public int hashCode() { + {{#useReflectionEqualsHashCode}} + return HashCodeBuilder.reflectionHashCode(this); + {{/useReflectionEqualsHashCode}} + {{^useReflectionEqualsHashCode}} + return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + {{/useReflectionEqualsHashCode}} + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class {{classname}} {\n"); + {{#parent}} + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + {{/parent}} + {{#vars}} + sb.append(" {{name}}: ").append(toIndentedString({{name}})).append("\n"); + {{/vars}} + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + {{#parcelableModel}} + public void writeToParcel(Parcel out, int flags) { + {{#model}} + {{#isArray}} + out.writeList(this); + {{/isArray}} + {{^isArray}} + {{#parent}} + super.writeToParcel(out, flags); + {{/parent}} + {{#vars}} + out.writeValue({{name}}); + {{/vars}} + {{/isArray}} + {{/model}} + } + + {{classname}}(Parcel in) { + {{#isArray}} + in.readTypedList(this, {{arrayModelType}}.CREATOR); + {{/isArray}} + {{^isArray}} + {{#parent}} + super(in); + {{/parent}} + {{#vars}} + {{#isPrimitiveType}} + {{name}} = ({{{datatypeWithEnum}}})in.readValue(null); + {{/isPrimitiveType}} + {{^isPrimitiveType}} + {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader()); + {{/isPrimitiveType}} + {{/vars}} + {{/isArray}} + } + + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { + public {{classname}} createFromParcel(Parcel in) { + {{#model}} + {{#isArray}} + {{classname}} result = new {{classname}}(); + result.addAll(in.readArrayList({{arrayModelType}}.class.getClassLoader())); + return result; + {{/isArray}} + {{^isArray}} + return new {{classname}}(in); + {{/isArray}} + {{/model}} + } + public {{classname}}[] newArray(int size) { + return new {{classname}}[size]; + } + }; + {{/parcelableModel}} +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/typeInfoAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/typeInfoAnnotation.mustache new file mode 100644 index 00000000000..63eb42ea500 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/typeInfoAnnotation.mustache @@ -0,0 +1,16 @@ +{{#jackson}} + +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true) +{{#discriminator.mappedModels}} +{{#-first}} +@JsonSubTypes({ +{{/-first}} + @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"), +{{#-last}} +}) +{{/-last}} +{{/discriminator.mappedModels}} +{{#isClassnameSanitized}} +@JsonTypeName("{{name}}") +{{/isClassnameSanitized}} +{{/jackson}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model/xmlAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/xmlAnnotation.mustache new file mode 100644 index 00000000000..04566fa1167 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model/xmlAnnotation.mustache @@ -0,0 +1,6 @@ +{{#withXml}} + +@XmlRootElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}") +@XmlAccessorType(XmlAccessType.FIELD) +{{#jackson}} +@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.groovy.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.groovy.mustache new file mode 100644 index 00000000000..fd5068a0947 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.groovy.mustache @@ -0,0 +1,46 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +{{#fullJavaUtil}} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +{{/fullJavaUtil}} + +/** + * Model tests for {{classname}} + */ +@MicronautTest +public class {{classname}}Spec extends Specification { + {{#models}} + {{#model}} + {{^vendorExtensions.x-is-one-of-interface}} + {{^isEnum}} + private final {{classname}} model = new {{classname}}() + + {{/isEnum}} + /** + * Model tests for {{classname}} + */ + void '{{classname}} test'() { + // TODO: test {{classname}} + } + + {{#allVars}} + /** + * Test the property '{{name}}' + */ + void '{{classname}} property {{name}} test'() { + // TODO: test {{name}} + } + + {{/allVars}} + {{/vendorExtensions.x-is-one-of-interface}} + {{/model}} + {{/models}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.mustache new file mode 100644 index 00000000000..7a213ec56fa --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/model_test.mustache @@ -0,0 +1,49 @@ +package {{package}}; + +{{#imports}}import {{import}}; +{{/imports}} +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; + +{{#fullJavaUtil}} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +{{/fullJavaUtil}} + +/** + * Model tests for {{classname}} + */ +@MicronautTest +public class {{classname}}Test { + {{#models}} + {{#model}} + {{^vendorExtensions.x-is-one-of-interface}} + {{^isEnum}} + private final {{classname}} model = new {{classname}}(); + + {{/isEnum}} + /** + * Model tests for {{classname}} + */ + @Test + public void test{{classname}}() { + // TODO: test {{classname}} + } + + {{#allVars}} + /** + * Test the property '{{name}}' + */ + @Test + public void {{name}}Test() { + // TODO: test {{name}} + } + + {{/allVars}} + {{/vendorExtensions.x-is-one-of-interface}} + {{/model}} + {{/models}} +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/beanValidation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/beanValidation.mustache new file mode 100644 index 00000000000..6fd7a75b066 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/beanValidation.mustache @@ -0,0 +1,34 @@ +{{#useBeanValidation}}{{! +validate all pojos and enums +}}{{^isContainer}}{{#isModel}}@Valid {{/isModel}}{{/isContainer}}{{! +nullable & nonnull +}}{{#required}}@NotNull {{/required}}{{#isNullable}}@Nullable {{/isNullable}}{{! +pattern +}}{{#pattern}}{{^isByteArray}}@Pattern(regexp="{{{pattern}}}") {{/isByteArray}}{{/pattern}}{{! +both minLength && maxLength +}}{{#minLength}}{{#maxLength}}@Size(min={{minLength}}, max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! +just minLength +}}{{#minLength}}{{^maxLength}}@Size(min={{minLength}}) {{/maxLength}}{{/minLength}}{{! +just maxLength +}}{{^minLength}}{{#maxLength}}@Size(max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! +@Size: both minItems && maxItems +}}{{#minItems}}{{#maxItems}}@Size(min={{minItems}}, max={{maxItems}}) {{/maxItems}}{{/minItems}}{{! +@Size: just minItems +}}{{#minItems}}{{^maxItems}}@Size(min={{minItems}}) {{/maxItems}}{{/minItems}}{{! +@Size: just maxItems +}}{{^minItems}}{{#maxItems}}@Size(max={{maxItems}}) {{/maxItems}}{{/minItems}}{{! +@Email +}}{{#isEmail}}@Email{{/isEmail}}{{! +check for integer or long / all others=decimal type with @Decimal* +isInteger set +}}{{#isInteger}}{{#minimum}}@Min({{minimum}}) {{/minimum}}{{#maximum}}@Max({{maximum}}) {{/maximum}}{{/isInteger}}{{! +isLong set +}}{{#isLong}}{{#minimum}}@Min({{minimum}}L) {{/minimum}}{{#maximum}}@Max({{maximum}}L) {{/maximum}}{{/isLong}}{{! +Not Integer, not Long => we have a decimal value! +}}{{^isInteger}}{{^isLong}}{{! +minimum for decimal value +}}{{#minimum}}@DecimalMin({{#exclusiveMinimum}}value={{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive=false{{/exclusiveMinimum}}) {{/minimum}}{{! +maximal for decimal value +}}{{#maximum}}@DecimalMax({{#exclusiveMaximum}}value={{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}) {{/maximum}}{{! +close decimal values +}}{{/isLong}}{{/isInteger}}{{/useBeanValidation}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/bodyParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/bodyParams.mustache new file mode 100644 index 00000000000..b111ea9e05d --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/bodyParams.mustache @@ -0,0 +1 @@ +{{#isBodyParam}}@Body {{>params/beanValidation}}{{>params/type}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/cookieParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/cookieParams.mustache new file mode 100644 index 00000000000..fab940b7460 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/cookieParams.mustache @@ -0,0 +1 @@ +{{#isCookieParam}}@CookieValue(value="{{baseName}}"{{#defaultValue}}, defaultValue="{{defaultValue}}"{{/defaultValue}}) {{>params/beanValidationCore}}{{>params/type}} {{paramName}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/formParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/formParams.mustache new file mode 100644 index 00000000000..e41f37e421f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/formParams.mustache @@ -0,0 +1 @@ +{{#isFormParam}}{{>params/beanValidation}}{{>params/type}} {{paramName}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/headerParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/headerParams.mustache new file mode 100644 index 00000000000..9aab83b5462 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/headerParams.mustache @@ -0,0 +1 @@ +{{#isHeaderParam}}@Header(name="{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>params/beanValidation}}{{>params/type}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/pathParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/pathParams.mustache new file mode 100644 index 00000000000..c67b97ed3f6 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/pathParams.mustache @@ -0,0 +1 @@ +{{#isPathParam}}@PathVariable(name="{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>params/beanValidation}}{{>params/type}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/queryParams.mustache new file mode 100644 index 00000000000..7ef44500582 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/queryParams.mustache @@ -0,0 +1 @@ +{{#isQueryParam}}@QueryParam(name="{{{baseName}}}"{{!default value}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{!multi format}}{{#isCollectionFormatMulti}}, format=QueryParam.Format.MULTI{{/isCollectionFormatMulti}}{{!deep object}}{{#isDeepObject}}, format=QueryParam.Format.DEEP_OBJECT{{/isDeepObject}}{{!other collection formats}}{{^isCollectionFormatMulti}}{{^isDeepObject}}{{#collectionFormat}}, format=QueryParam.Format.{{#lambda.uppercase}}{{collectionFormat}}{{/lambda.uppercase}}{{/collectionFormat}}{{/isDeepObject}}{{/isCollectionFormatMulti}}) {{!validation and type}}{{>params/beanValidation}}{{>params/type}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/params/type.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/type.mustache new file mode 100644 index 00000000000..e8a56ad01d8 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/params/type.mustache @@ -0,0 +1 @@ +{{!normal type}}{{^isDate}}{{^isDateTime}}{{{dataType}}}{{/isDateTime}}{{/isDate}}{{!date-time}}{{#isDateTime}}@Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") {{{dataType}}}{{/isDateTime}}{{!date}}{{#isDate}}@Format("yyyy-MM-dd") {{{dataType}}}{{/isDate}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParam.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParam.mustache new file mode 100644 index 00000000000..343602f340b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParam.mustache @@ -0,0 +1,78 @@ +{{>licenseInfo}} +package {{invokerPackage}}.query; + +import io.micronaut.context.annotation.AliasFor; +import io.micronaut.core.bind.annotation.Bindable; +import javax.annotation.Generated; +import java.lang.annotation.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + + +/** + * Indicates that the parameter is a query parameter + */ +{{>generatedAnnotation}} +@Documented +@Retention(RUNTIME) +@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE}) +@Bindable +@Inherited +public @interface QueryParam { + + /** + * @return The name of the parameter + */ + @AliasFor(annotation = Bindable.class, member = "value") + String value() default ""; + + /** + * @return The name of the parameter + */ + @AliasFor(annotation = Bindable.class, member = "value") + String name() default ""; + + /** + * @see Bindable#defaultValue() + * @return The default value + */ + @AliasFor(annotation = Bindable.class, member = "defaultValue") + String defaultValue() default ""; + + /** + * @return The format of the given values in the URL + */ + Format format() default Format.CSV; + + /** + * The possible formats of the query parameter in the URL. + * The conversion of various types is according to openapi v3 specification: + * @see openapi v3 specification + * Values are serialized using Jackson object mapper + */ + public static enum Format { + /** + * The values of iterator are comma-delimited. + * Ambiguity can arise if values of Iterator contain commas inside themselves. In such case, the MUTLI format + * should be preferred. + * Null values are not supported and will be removed during the conversion process. + */ + CSV, + /** + * The values are space-delimited, similarly to comma-delimited format. + */ + SSV, + /** + * The values a delimited by pipes "|", similarly to comma-delimited format. + */ + PIPES, + /** + * The values are repeated as separate parameters, e.g.: color=blue&color=black&color=brown. + */ + MULTI, + /** + * The format supports 1-depth recursion into objects with setting each attribute as a separate parameter, e.g.: + * 'color[R]=100&color[G]=200&color[B]=150'. + */ + DEEP_OBJECT + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParamBinder.mustache b/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParamBinder.mustache new file mode 100644 index 00000000000..66ac28ad189 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut-client/query/QueryParamBinder.mustache @@ -0,0 +1,164 @@ +{{>licenseInfo}} +package {{invokerPackage}}.query; + +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.beans.BeanProperty; +import io.micronaut.core.beans.BeanWrapper; +import io.micronaut.core.convert.ArgumentConversionContext; +import io.micronaut.core.convert.ConversionContext; +import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.client.bind.AnnotatedClientArgumentRequestBinder; +import io.micronaut.http.client.bind.ClientRequestUriContext; + +import java.util.Collection; +import java.util.Optional; +import jakarta.inject.Singleton; +import javax.annotation.Generated; + + +{{>generatedAnnotation}} +@Singleton +public class QueryParamBinder implements AnnotatedClientArgumentRequestBinder { + private static final Character COMMA_DELIMITER = ','; + private static final Character PIPE_DELIMITER = '|'; + private static final Character SPACE_DELIMITER = ' '; + + private final ConversionService conversionService; + + public QueryParamBinder(ConversionService conversionService) { + this.conversionService = conversionService; + } + + @NonNull + @Override + public Class getAnnotationType() { + return QueryParam.class; + } + + @Override + public void bind(@NonNull ArgumentConversionContext context, + @NonNull ClientRequestUriContext uriContext, + @NonNull Object value, + @NonNull MutableHttpRequest request + ) { + String key = context.getAnnotationMetadata().stringValue(QueryParam.class) + .filter(StringUtils::isNotEmpty) + .orElse(context.getArgument().getName()); + + QueryParam.Format format = context.getAnnotationMetadata() + .enumValue(QueryParam.class, "format", QueryParam.Format.class) + .orElse(QueryParam.Format.CSV); + + if (format == QueryParam.Format.DEEP_OBJECT) { + addDeepObjectParameters(context, value, key, uriContext); + } else if (format == QueryParam.Format.MULTI) { + addMultiParameters(context, value, key, uriContext); + } else { + Character delimiter = ' '; + switch (format) { + case SSV: + delimiter = SPACE_DELIMITER; + break; + case PIPES: + delimiter = PIPE_DELIMITER; + break; + case CSV: + delimiter = COMMA_DELIMITER; + break; + default: + } + createSeparatedQueryParam(context, value, delimiter) + .ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } + + private void addMultiParameters( + ArgumentConversionContext context, Object value, String key, ClientRequestUriContext uriContext + ) { + if (value instanceof Iterable) { + // noinspection unechecked + Iterable iterable = (Iterable) value; + + for (Object item : iterable) { + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } else { + convertToString(context, value).ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } + + private void addDeepObjectParameters( + ArgumentConversionContext context, Object value, String key, ClientRequestUriContext uriContext + ) { + if (value instanceof Iterable) { + StringBuilder builder = new StringBuilder(key); + + Iterable iterable = (Iterable) value; + + int i = 0; + for (Object item: iterable) { + if (item == null) { + continue; + } + String index = String.valueOf(i); + + builder.append('['); + builder.append(index); + builder.append(']'); + + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(builder.toString(), v)); + builder.delete(builder.length() - index.length() - 2, builder.length()); + i++; + } + } else if (value != null) { + StringBuilder builder = new StringBuilder(key); + BeanWrapper wrapper = BeanWrapper.getWrapper(value); + Collection> properties = wrapper.getBeanProperties(); + for (BeanProperty property: properties) { + Object item = property.get(value); + if (item == null) { + continue; + } + builder.append('['); + builder.append(property.getName()); + builder.append(']'); + + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(builder.toString(), v)); + builder.delete(builder.length() - property.getName().length() - 2, builder.length()); + } + } + } + + private Optional createSeparatedQueryParam( + ArgumentConversionContext context, Object value, Character delimiter + ) { + if (value instanceof Iterable) { + StringBuilder builder = new StringBuilder(); + // noinspection unechecked + Iterable iterable = (Iterable) value; + + boolean first = true; + for (Object item : iterable) { + Optional opt = convertToString(context, item); + if (opt.isPresent()) { + if (!first) { + builder.append(delimiter); + } + first = false; + builder.append(opt.get()); + } + } + + return Optional.of(builder.toString()); + } else { + return convertToString(context, value); + } + } + + private Optional convertToString(ArgumentConversionContext context, Object value) { + return conversionService.convert(value, ConversionContext.STRING.with(context.getAnnotationMetadata())) + .filter(StringUtils::isNotEmpty); + } +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java new file mode 100644 index 00000000000..16e65c34c5b --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java @@ -0,0 +1,250 @@ +package org.openapitools.codegen.java.micronaut; + +import io.swagger.parser.OpenAPIParser; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.parser.core.models.ParseOptions; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.ClientOptInput; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.DefaultGenerator; +import org.openapitools.codegen.languages.JavaMicronautClientCodegen; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; + +import static java.util.stream.Collectors.groupingBy; +import static org.testng.Assert.*; +import static org.testng.Assert.fail; + +public class MicronautClientCodegenTest { + private final String PETSTORE_PATH = "src/test/resources/petstore.json"; + + @Test + public void clientOptsUnicity() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.cliOptions() + .stream() + .collect(groupingBy(CliOption::getOpt)) + .forEach((k, v) -> assertEquals(v.size(), 1, k + " is described multiple times")); + } + + @Test + public void testInitialConfigValues() throws Exception { + final JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.processOpts(); + + OpenAPI openAPI = new OpenAPI(); + openAPI.addServersItem(new Server().url("https://one.com/v2")); + openAPI.setInfo(new Info()); + codegen.preprocessOpenAPI(openAPI); + + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); + Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); + Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model"); + Assert.assertEquals(codegen.apiPackage(), "org.openapitools.api"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "org.openapitools.api"); + Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "org.openapitools"); + } + + @Test + public void doConfigureAuthParam() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS); + + // Files generated + assertFileExists(outputPath + "/src/main/java/org/openapitools/auth/Authorization.java"); + // Endpoints are annotated with @Authorization Bindable + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Authorization"); + } + + @Test + public void doNotConfigureAuthParam() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "false"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS); + + // Files are not generated + assertFileNotExists(outputPath + "/src/main/java/org/openapitools/auth/"); + assertFileNotContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Authorization"); + } + + @Test + public void doUseValidationParam() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "false"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.APIS); + + // Files are not generated + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Valid"); + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@NotNull"); + } + + @Test + public void doGenerateForMaven() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_BUILD, + JavaMicronautClientCodegen.OPT_BUILD_MAVEN); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES); + + // Files are not generated + assertFileExists(outputPath + "/pom.xml"); + assertFileNotExists(outputPath + "/build.gradle"); + } + + @Test + public void doGenerateForGradle() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_BUILD, + JavaMicronautClientCodegen.OPT_BUILD_GRADLE); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES); + + // Files are not generated + assertFileExists(outputPath + "/build.gradle"); + assertFileNotExists(outputPath + "/pom.xml"); + } + + @Test + public void doGenerateForTestJUnit() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_BUILD, + JavaMicronautClientCodegen.OPT_BUILD_ALL); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_TEST, + JavaMicronautClientCodegen.OPT_TEST_JUNIT); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + + // Files are not generated + assertFileContains(outputPath + "build.gradle", "testRuntime(\"junit"); + assertFileContains(outputPath + "pom.xml", "micronaut-test-junit"); + assertFileNotContains(outputPath + "build.gradle", "testRuntime(\"spock"); + assertFileNotContains(outputPath + "pom.xml", "micronaut-test-spock"); + assertFileExists(outputPath + "src/test/java/"); + assertFileExists(outputPath + "src/test/java/org/openapitools/api/PetApiTest.java"); + assertFileContains(outputPath + "src/test/java/org/openapitools/api/PetApiTest.java", "PetApiTest", "@MicronautTest"); + } + + @Test + public void doGenerateForTestSpock() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_BUILD, + JavaMicronautClientCodegen.OPT_BUILD_ALL); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_TEST, + JavaMicronautClientCodegen.OPT_TEST_SPOCK); + String outputPath = generateFiles(codegen, PETSTORE_PATH, + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + + // Files are not generated + assertFileNotContains(outputPath + "build.gradle", "testRuntime(\"junit"); + assertFileNotContains(outputPath + "pom.xml", "micronaut-test-junit"); + assertFileContains(outputPath + "build.gradle", "testRuntime(\"spock"); + assertFileContains(outputPath + "pom.xml", "micronaut-test-spock"); + assertFileExists(outputPath + "src/test/groovy"); + assertFileExists(outputPath + "src/test/groovy/org/openapitools/api/PetApiSpec.groovy"); + assertFileContains(outputPath + "src/test/groovy/org/openapitools/api/PetApiSpec.groovy", "PetApiSpec", "@MicronautTest"); + } + + /** + * + * @param codegen - the code generator + * @param configPath - the path to the config starting from src/test/resources + * @param filesToGenerate - which files to generate - can be CodegenConstants.MODELS, APIS, SUPPORTING_FILES, ... + * @return - the path to the generated folder + */ + protected String generateFiles(JavaMicronautClientCodegen codegen, String configPath, String... filesToGenerate) { + File output = null; + try { + output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + } catch (IOException e) { + fail("Unable to create temporary directory for output"); + } + output.deleteOnExit(); + + // Create parser + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation(configPath, null, new ParseOptions()).getOpenAPI(); + + // Configure codegen + codegen.setOutputDir(outputPath); + + // Create input + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + // Generate + DefaultGenerator generator = new DefaultGenerator(); + // by default nothing is generated + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.API_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.API_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + // set all the files user wants to generate + for (String files: filesToGenerate) { + generator.setGeneratorPropertyDefault(files, "true"); + } + + generator.opts(input).generate(); + + return outputPath + "/"; + } + + public static void assertFileContains(String path, String... lines) { + String file = readFile(path); + for (String line : lines) + assertTrue(file.contains(linearize(line)), "File does not contain line [" + line + "]"); + } + + public static void assertFileNotContains(String path, String... lines) { + String file = readFile(path); + for (String line : lines) + assertFalse(file.contains(linearize(line)), "File contains line [" + line + "]"); + } + + public static void assertFileExists(String path) { + assertTrue(Paths.get(path).toFile().exists(), "File \"" + path + "\" should exist"); + } + + public static void assertFileNotExists(String path) { + assertFalse(Paths.get(path).toFile().exists(), "File \"" + path + "\" should not exist"); + } + + public static String readFile(String path) { + String file = null; + try { + String generatedFile = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8); + file = linearize(generatedFile); + assertNotNull(file); + } catch (IOException e) { + fail("Unable to evaluate file " + path.toString()); + } + + return file; + } + + public static String linearize(String target) { + return target.replaceAll("\r?\n", "").replaceAll("\\s+", "\\s"); + } +} diff --git a/pom.xml b/pom.xml index 38449ea2435..9e91c087a86 100644 --- a/pom.xml +++ b/pom.xml @@ -775,6 +775,18 @@ samples/client/petstore/scala-httpclient + + java-micronaut-client + + + env + java + + + + samples/client/petstore/java-micronaut-client + + java-msf4j-server diff --git a/samples/client/petstore/java-micronaut-client/.gitignore b/samples/client/petstore/java-micronaut-client/.gitignore new file mode 100644 index 00000000000..a530464afa1 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java-micronaut-client/.mvn/wrapper/MavenWrapperDownloader.java b/samples/client/petstore/java-micronaut-client/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000000..fc435c409b3 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,124 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.Authenticator; +import java.net.PasswordAuthentication; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/.mvn/wrapper/maren-wrapper.properties b/samples/client/petstore/java-micronaut-client/.mvn/wrapper/maren-wrapper.properties new file mode 100644 index 00000000000..642d572ce90 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.mvn/wrapper/maren-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator-ignore b/samples/client/petstore/java-micronaut-client/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/FILES b/samples/client/petstore/java-micronaut-client/.openapi-generator/FILES new file mode 100644 index 00000000000..049c3b6f038 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/FILES @@ -0,0 +1,123 @@ +.gitignore +.mvn/wrapper/MavenWrapperDownloader.java +.mvn/wrapper/maren-wrapper.properties +.mvn/wrapper/maven-wrapper.jar +README.md +build.gradle +docs/AdditionalPropertiesAnyType.md +docs/AdditionalPropertiesArray.md +docs/AdditionalPropertiesBoolean.md +docs/AdditionalPropertiesClass.md +docs/AdditionalPropertiesInteger.md +docs/AdditionalPropertiesNumber.md +docs/AdditionalPropertiesObject.md +docs/AdditionalPropertiesString.md +docs/Animal.md +docs/AnotherFakeApi.md +docs/ArrayOfArrayOfNumberOnly.md +docs/ArrayOfNumberOnly.md +docs/ArrayTest.md +docs/BigCat.md +docs/BigCatAllOf.md +docs/Capitalization.md +docs/Cat.md +docs/CatAllOf.md +docs/Category.md +docs/ClassModel.md +docs/Dog.md +docs/DogAllOf.md +docs/EnumArrays.md +docs/EnumClass.md +docs/EnumTest.md +docs/FakeApi.md +docs/FakeClassnameTags123Api.md +docs/FileSchemaTestClass.md +docs/FormatTest.md +docs/HasOnlyReadOnly.md +docs/MapTest.md +docs/MixedPropertiesAndAdditionalPropertiesClass.md +docs/Model200Response.md +docs/ModelApiResponse.md +docs/ModelClient.md +docs/ModelReturn.md +docs/Name.md +docs/NumberOnly.md +docs/Order.md +docs/OuterComposite.md +docs/OuterEnum.md +docs/Pet.md +docs/PetApi.md +docs/ReadOnlyFirst.md +docs/SpecialModelName.md +docs/StoreApi.md +docs/Tag.md +docs/TypeHolderDefault.md +docs/TypeHolderExample.md +docs/User.md +docs/UserApi.md +docs/XmlItem.md +docs/auth.md +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +mvnw +mvnw.bat +pom.xml +settings.gradle +src/main/java/org/openapitools/api/AnotherFakeApi.java +src/main/java/org/openapitools/api/FakeApi.java +src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +src/main/java/org/openapitools/api/PetApi.java +src/main/java/org/openapitools/api/StoreApi.java +src/main/java/org/openapitools/api/UserApi.java +src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +src/main/java/org/openapitools/model/AdditionalPropertiesString.java +src/main/java/org/openapitools/model/Animal.java +src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +src/main/java/org/openapitools/model/ArrayTest.java +src/main/java/org/openapitools/model/BigCat.java +src/main/java/org/openapitools/model/BigCatAllOf.java +src/main/java/org/openapitools/model/Capitalization.java +src/main/java/org/openapitools/model/Cat.java +src/main/java/org/openapitools/model/CatAllOf.java +src/main/java/org/openapitools/model/Category.java +src/main/java/org/openapitools/model/ClassModel.java +src/main/java/org/openapitools/model/Dog.java +src/main/java/org/openapitools/model/DogAllOf.java +src/main/java/org/openapitools/model/EnumArrays.java +src/main/java/org/openapitools/model/EnumClass.java +src/main/java/org/openapitools/model/EnumTest.java +src/main/java/org/openapitools/model/FileSchemaTestClass.java +src/main/java/org/openapitools/model/FormatTest.java +src/main/java/org/openapitools/model/HasOnlyReadOnly.java +src/main/java/org/openapitools/model/MapTest.java +src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +src/main/java/org/openapitools/model/Model200Response.java +src/main/java/org/openapitools/model/ModelApiResponse.java +src/main/java/org/openapitools/model/ModelClient.java +src/main/java/org/openapitools/model/ModelReturn.java +src/main/java/org/openapitools/model/Name.java +src/main/java/org/openapitools/model/NumberOnly.java +src/main/java/org/openapitools/model/Order.java +src/main/java/org/openapitools/model/OuterComposite.java +src/main/java/org/openapitools/model/OuterEnum.java +src/main/java/org/openapitools/model/Pet.java +src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/SpecialModelName.java +src/main/java/org/openapitools/model/Tag.java +src/main/java/org/openapitools/model/TypeHolderDefault.java +src/main/java/org/openapitools/model/TypeHolderExample.java +src/main/java/org/openapitools/model/User.java +src/main/java/org/openapitools/model/XmlItem.java +src/main/java/org/openapitools/query/QueryParam.java +src/main/java/org/openapitools/query/QueryParamBinder.java +src/main/resources/application.yml diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION new file mode 100644 index 00000000000..6555596f931 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION @@ -0,0 +1 @@ +5.2.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/README.md b/samples/client/petstore/java-micronaut-client/README.md new file mode 100644 index 00000000000..a61167f1d20 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/README.md @@ -0,0 +1,49 @@ +# petstore-micronaut + +This is a generated client based on [Micronaut](https://micronaut.io/) framework. + +## Configuration + +A Micronaut's application can be created by defyning a main class and running: +```java +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; + +public class Application { + + public static void main(String[] args) { + ApplicationContext context = Micronaut.run(Application.class); + } +} +``` + +More detailed description can be found in the [Micronaut Guide](https://docs.micronaut.io/latest/guide/#ideSetup). + +All the properties can be changed in the [application.yml][src/main/resources/application.yml] file or when creating micronaut application as described in [Configuration section of guide](https://docs.micronaut.io/latest/guide/#config). + +## Api Guides + +Description on how to create Apis is given inside individual api guides: + +* [AnotherFakeApi](docs//AnotherFakeApi.md) +* [FakeApi](docs//FakeApi.md) +* [FakeClassnameTags123Api](docs//FakeClassnameTags123Api.md) +* [PetApi](docs//PetApi.md) +* [StoreApi](docs//StoreApi.md) +* [UserApi](docs//UserApi.md) + + +## Auth methods + +Details on auth methods can be found in the [auth.md](doc/auth.md). + +## Author + + + + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/build.gradle b/samples/client/petstore/java-micronaut-client/build.gradle new file mode 100644 index 00000000000..856fe2d4349 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/build.gradle @@ -0,0 +1,44 @@ +plugins { + id("groovy") + id("com.github.johnrengelman.shadow") version "7.0.0" + id("io.micronaut.application") version "2.0.3" +} + +version = "1.0.0" +group = "org.openapitools" + +repositories { + mavenCentral() +} + +micronaut { + runtime("netty") + testRuntime("spock2") + processing { + incremental(true) + annotations("org.openapitools.*") + } +} + + +dependencies { + annotationProcessor("io.micronaut:micronaut-http-validation") + annotationProcessor("io.micronaut.security:micronaut-security-annotations") + implementation("io.micronaut:micronaut-http-client") + implementation("io.micronaut:micronaut-runtime") + implementation("io.micronaut:micronaut-validation") + implementation("io.micronaut.security:micronaut-security") + implementation("io.micronaut.security:micronaut-security-oauth2") + implementation("io.micronaut.reactor:micronaut-reactor") + implementation("io.swagger:swagger-annotations:1.5.9") + runtimeOnly("ch.qos.logback:logback-classic") +} + +// TODO Set the main class +application { + mainClass.set("org.openapitools.Application") +} +java { + sourceCompatibility = JavaVersion.toVersion("1.8") + targetCompatibility = JavaVersion.toVersion("1.8") +} diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesAnyType.md new file mode 100644 index 00000000000..fddcd9d8e0f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesAnyType.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesAnyType + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesArray.md new file mode 100644 index 00000000000..c52113f687b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesArray.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesArray + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesBoolean.md new file mode 100644 index 00000000000..9d626b44668 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesBoolean.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesBoolean + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesClass.md new file mode 100644 index 00000000000..84f88e3fdba --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesClass.md @@ -0,0 +1,26 @@ + + +# AdditionalPropertiesClass + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**mapString** | `Map<String, String>` | | [optional property] +**mapNumber** | `Map<String, BigDecimal>` | | [optional property] +**mapInteger** | `Map<String, Integer>` | | [optional property] +**mapBoolean** | `Map<String, Boolean>` | | [optional property] +**mapArrayInteger** | `Map<String, List<Integer>>` | | [optional property] +**mapArrayAnytype** | `Map<String, List<Object>>` | | [optional property] +**mapMapString** | `Map<String, Map<String, String>>` | | [optional property] +**mapMapAnytype** | `Map<String, Map<String, Object>>` | | [optional property] +**anytype1** | `Object` | | [optional property] +**anytype2** | `Object` | | [optional property] +**anytype3** | `Object` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesInteger.md new file mode 100644 index 00000000000..b17edb55655 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesInteger.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesInteger + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesNumber.md new file mode 100644 index 00000000000..bd33c906eeb --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesNumber.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesNumber + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesObject.md new file mode 100644 index 00000000000..a77d38c7b19 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesObject.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesObject + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesString.md b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesString.md new file mode 100644 index 00000000000..6f1ccd0910d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AdditionalPropertiesString.md @@ -0,0 +1,16 @@ + + +# AdditionalPropertiesString + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Animal.md b/samples/client/petstore/java-micronaut-client/docs/Animal.md new file mode 100644 index 00000000000..4d92e8e7e29 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Animal.md @@ -0,0 +1,17 @@ + + +# Animal + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**className** | `String` | | +**color** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/AnotherFakeApi.md b/samples/client/petstore/java-micronaut-client/docs/AnotherFakeApi.md new file mode 100644 index 00000000000..df06b72730b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/AnotherFakeApi.md @@ -0,0 +1,62 @@ +# AnotherFakeApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags + + +## Creating AnotherFakeApi + +To initiate an instance of `AnotherFakeApi`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.AnotherFakeApi; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(AnotherFakeApi.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + AnotherFakeApi anotherFakeApi; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **call123testSpecialTags** +```java +Mono AnotherFakeApi.call123testSpecialTags(_body) +``` + +To test special tags + +To test special tags and operation ID starting with number + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**ModelClient**](ModelClient.md)| client model | + + +### Return type +[**ModelClient**](ModelClient.md) + + + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: `application/json` + diff --git a/samples/client/petstore/java-micronaut-client/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java-micronaut-client/docs/ArrayOfArrayOfNumberOnly.md new file mode 100644 index 00000000000..65f6fb827f1 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ArrayOfArrayOfNumberOnly.md @@ -0,0 +1,16 @@ + + +# ArrayOfArrayOfNumberOnly + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**arrayArrayNumber** | `List<List<BigDecimal>>` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java-micronaut-client/docs/ArrayOfNumberOnly.md new file mode 100644 index 00000000000..2909608f6e8 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ArrayOfNumberOnly.md @@ -0,0 +1,16 @@ + + +# ArrayOfNumberOnly + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**arrayNumber** | `List<BigDecimal>` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ArrayTest.md b/samples/client/petstore/java-micronaut-client/docs/ArrayTest.md new file mode 100644 index 00000000000..ee3f7633b28 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ArrayTest.md @@ -0,0 +1,18 @@ + + +# ArrayTest + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**arrayOfString** | `List<String>` | | [optional property] +**arrayArrayOfInteger** | `List<List<Long>>` | | [optional property] +**arrayArrayOfModel** | `List<List<ReadOnlyFirst>>` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/BigCat.md b/samples/client/petstore/java-micronaut-client/docs/BigCat.md new file mode 100644 index 00000000000..e368f81567f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/BigCat.md @@ -0,0 +1,26 @@ + + +# BigCat + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**kind** | [**KindEnum**](#KindEnum) | | [optional property] + + + +## Enum: KindEnum + +Name | Value +---- | ----- +LIONS | `"lions"` +TIGERS | `"tigers"` +LEOPARDS | `"leopards"` +JAGUARS | `"jaguars"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/BigCatAllOf.md b/samples/client/petstore/java-micronaut-client/docs/BigCatAllOf.md new file mode 100644 index 00000000000..869236ae81d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/BigCatAllOf.md @@ -0,0 +1,26 @@ + + +# BigCatAllOf + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**kind** | [**KindEnum**](#KindEnum) | | [optional property] + + + +## Enum: KindEnum + +Name | Value +---- | ----- +LIONS | `"lions"` +TIGERS | `"tigers"` +LEOPARDS | `"leopards"` +JAGUARS | `"jaguars"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Capitalization.md b/samples/client/petstore/java-micronaut-client/docs/Capitalization.md new file mode 100644 index 00000000000..fb5232d52de --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Capitalization.md @@ -0,0 +1,21 @@ + + +# Capitalization + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**smallCamel** | `String` | | [optional property] +**capitalCamel** | `String` | | [optional property] +**smallSnake** | `String` | | [optional property] +**capitalSnake** | `String` | | [optional property] +**scAETHFlowPoints** | `String` | | [optional property] +**ATT_NAME** | `String` | Name of the pet | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Cat.md b/samples/client/petstore/java-micronaut-client/docs/Cat.md new file mode 100644 index 00000000000..4a7e1503b1e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Cat.md @@ -0,0 +1,16 @@ + + +# Cat + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**declawed** | `Boolean` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/CatAllOf.md b/samples/client/petstore/java-micronaut-client/docs/CatAllOf.md new file mode 100644 index 00000000000..41f0898e7c0 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/CatAllOf.md @@ -0,0 +1,16 @@ + + +# CatAllOf + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**declawed** | `Boolean` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Category.md b/samples/client/petstore/java-micronaut-client/docs/Category.md new file mode 100644 index 00000000000..497a0ce8d45 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Category.md @@ -0,0 +1,17 @@ + + +# Category + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | `Long` | | [optional property] +**name** | `String` | | + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ClassModel.md b/samples/client/petstore/java-micronaut-client/docs/ClassModel.md new file mode 100644 index 00000000000..e428f3bc207 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ClassModel.md @@ -0,0 +1,17 @@ + + +# ClassModel + +Model for testing model with \"_class\" property + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**propertyClass** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Dog.md b/samples/client/petstore/java-micronaut-client/docs/Dog.md new file mode 100644 index 00000000000..db403946fcd --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Dog.md @@ -0,0 +1,16 @@ + + +# Dog + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**breed** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/DogAllOf.md b/samples/client/petstore/java-micronaut-client/docs/DogAllOf.md new file mode 100644 index 00000000000..e89dd640696 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/DogAllOf.md @@ -0,0 +1,16 @@ + + +# DogAllOf + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**breed** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/EnumArrays.md b/samples/client/petstore/java-micronaut-client/docs/EnumArrays.md new file mode 100644 index 00000000000..f905c2dab35 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/EnumArrays.md @@ -0,0 +1,33 @@ + + +# EnumArrays + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**justSymbol** | [**JustSymbolEnum**](#JustSymbolEnum) | | [optional property] +**arrayEnum** | [**List<ArrayEnumEnum>**](#List<ArrayEnumEnum>) | | [optional property] + + + +## Enum: JustSymbolEnum + +Name | Value +---- | ----- +GREATER_THAN_OR_EQUAL_TO | `">="` +DOLLAR | `"$"` + + +## Enum: List<ArrayEnumEnum> + +Name | Value +---- | ----- +FISH | `"fish"` +CRAB | `"crab"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/EnumClass.md b/samples/client/petstore/java-micronaut-client/docs/EnumClass.md new file mode 100644 index 00000000000..b314590a759 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/EnumClass.md @@ -0,0 +1,15 @@ + + +# EnumClass + +## Enum + + +* `_ABC` (value: `"_abc"`) + +* `_EFG` (value: `"-efg"`) + +* `_XYZ_` (value: `"(xyz)"`) + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/EnumTest.md b/samples/client/petstore/java-micronaut-client/docs/EnumTest.md new file mode 100644 index 00000000000..d2a2431223e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/EnumTest.md @@ -0,0 +1,54 @@ + + +# EnumTest + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**enumString** | [**EnumStringEnum**](#EnumStringEnum) | | [optional property] +**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) | | +**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) | | [optional property] +**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) | | [optional property] +**outerEnum** | `OuterEnum` | | [optional property] + + + +## Enum: EnumStringEnum + +Name | Value +---- | ----- +UPPER | `"UPPER"` +LOWER | `"lower"` +EMPTY | `""` + + +## Enum: EnumStringRequiredEnum + +Name | Value +---- | ----- +UPPER | `"UPPER"` +LOWER | `"lower"` +EMPTY | `""` + + +## Enum: EnumIntegerEnum + +Name | Value +---- | ----- +NUMBER_1 | `1` +NUMBER_MINUS_1 | `-1` + + +## Enum: EnumNumberEnum + +Name | Value +---- | ----- +NUMBER_1_DOT_1 | `1.1` +NUMBER_MINUS_1_DOT_2 | `-1.2` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/FakeApi.md b/samples/client/petstore/java-micronaut-client/docs/FakeApi.md new file mode 100644 index 00000000000..5baa181a600 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/FakeApi.md @@ -0,0 +1,417 @@ +# FakeApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem +[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | +[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | +[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | +[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | +[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | +[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | +[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model +[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 +[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters +[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional) +[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties +[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data +[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | + + +## Creating FakeApi + +To initiate an instance of `FakeApi`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.FakeApi; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(FakeApi.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + FakeApi fakeApi; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **createXmlItem** +```java +Mono FakeApi.createXmlItem(xmlItem) +``` + +creates an XmlItem + +this route creates an XmlItem + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body | + + + + + + +### HTTP request headers + - **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 + + +# **fakeOuterBooleanSerialize** +```java +Mono FakeApi.fakeOuterBooleanSerialize(_body) +``` + + + +Test serialization of outer boolean types + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | `Boolean`| Input boolean as post body | [optional parameter] + + +### Return type +`Boolean` + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `*/*` + + +# **fakeOuterCompositeSerialize** +```java +Mono FakeApi.fakeOuterCompositeSerialize(_body) +``` + + + +Test serialization of object with outer number type + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional parameter] + + +### Return type +[**OuterComposite**](OuterComposite.md) + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `*/*` + + +# **fakeOuterNumberSerialize** +```java +Mono FakeApi.fakeOuterNumberSerialize(_body) +``` + + + +Test serialization of outer number types + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | `BigDecimal`| Input number as post body | [optional parameter] + + +### Return type +[**BigDecimal**](BigDecimal.md) + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `*/*` + + +# **fakeOuterStringSerialize** +```java +Mono FakeApi.fakeOuterStringSerialize(_body) +``` + + + +Test serialization of outer string types + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | `String`| Input string as post body | [optional parameter] + + +### Return type +`String` + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `*/*` + + +# **testBodyWithFileSchema** +```java +Mono FakeApi.testBodyWithFileSchema(_body) +``` + + + +For this test, the body for this request much reference a schema named `File`. + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)| | + + + + + + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: Not defined + + +# **testBodyWithQueryParams** +```java +Mono FakeApi.testBodyWithQueryParams(query_body) +``` + + + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **query** | `String`| | + **_body** | [**User**](User.md)| | + + + + + + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: Not defined + + +# **testClientModel** +```java +Mono FakeApi.testClientModel(_body) +``` + +To test \"client\" model + +To test \"client\" model + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**ModelClient**](ModelClient.md)| client model | + + +### Return type +[**ModelClient**](ModelClient.md) + + + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: `application/json` + + +# **testEndpointParameters** +```java +Mono FakeApi.testEndpointParameters(number_doublepatternWithoutDelimiter_byteintegerint32int64_floatstringbinarydatedateTimepasswordparamCallback) +``` + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **number** | `BigDecimal`| None | + **_double** | `Double`| None | + **patternWithoutDelimiter** | `String`| None | + **_byte** | `byte[]`| None | + **integer** | `Integer`| None | [optional parameter] + **int32** | `Integer`| None | [optional parameter] + **int64** | `Long`| None | [optional parameter] + **_float** | `Float`| None | [optional parameter] + **string** | `String`| None | [optional parameter] + **binary** | `File`| None | [optional parameter] + **date** | `LocalDate`| None | [optional parameter] + **dateTime** | `LocalDateTime`| None | [optional parameter] + **password** | `String`| None | [optional parameter] + **paramCallback** | `String`| None | [optional parameter] + + + + +### Authorization +* **[http_basic_test](auth.md#http_basic_test)** + +### HTTP request headers + - **Content-Type**: `application/x-www-form-urlencoded` + - **Accept**: Not defined + + +# **testEnumParameters** +```java +Mono FakeApi.testEnumParameters(enumHeaderStringArrayenumHeaderStringenumQueryStringArrayenumQueryStringenumQueryIntegerenumQueryDoubleenumFormStringArrayenumFormString) +``` + +To test enum parameters + +To test enum parameters + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **enumHeaderStringArray** | [**List<String>**](String.md)| Header parameter enum test (string array) | [optional parameter] [enum: `>`, `$`] + **enumHeaderString** | `String`| Header parameter enum test (string) | [optional parameter] [default to `-efg`] [enum: `_abc`, `-efg`, `(xyz)`] + **enumQueryStringArray** | [**List<String>**](String.md)| Query parameter enum test (string array) | [optional parameter] [enum: `>`, `$`] + **enumQueryString** | `String`| Query parameter enum test (string) | [optional parameter] [default to `-efg`] [enum: `_abc`, `-efg`, `(xyz)`] + **enumQueryInteger** | `Integer`| Query parameter enum test (double) | [optional parameter] [enum: `1`, `-2`] + **enumQueryDouble** | `Double`| Query parameter enum test (double) | [optional parameter] [enum: `1.1`, `-1.2`] + **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional parameter] [default to `$`] [enum: `>`, `$`] + **enumFormString** | `String`| Form parameter enum test (string) | [optional parameter] [default to `-efg`] [enum: `_abc`, `-efg`, `(xyz)`] + + + + + + +### HTTP request headers + - **Content-Type**: `application/x-www-form-urlencoded` + - **Accept**: Not defined + + +# **testGroupParameters** +```java +Mono FakeApi.testGroupParameters(requiredStringGrouprequiredBooleanGrouprequiredInt64GroupstringGroupbooleanGroupint64Group) +``` + +Fake endpoint to test group parameters (optional) + +Fake endpoint to test group parameters (optional) + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **requiredStringGroup** | `Integer`| Required String in group parameters | + **requiredBooleanGroup** | `Boolean`| Required Boolean in group parameters | + **requiredInt64Group** | `Long`| Required Integer in group parameters | + **stringGroup** | `Integer`| String in group parameters | [optional parameter] + **booleanGroup** | `Boolean`| Boolean in group parameters | [optional parameter] + **int64Group** | `Long`| Integer in group parameters | [optional parameter] + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **testInlineAdditionalProperties** +```java +Mono FakeApi.testInlineAdditionalProperties(param) +``` + +test inline additionalProperties + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **param** | [**Map<String, String>**](String.md)| request body | + + + + + + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: Not defined + + +# **testJsonFormData** +```java +Mono FakeApi.testJsonFormData(paramparam2) +``` + +test json serialization of form data + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **param** | `String`| field1 | + **param2** | `String`| field2 | + + + + + + +### HTTP request headers + - **Content-Type**: `application/x-www-form-urlencoded` + - **Accept**: Not defined + + +# **testQueryParameterCollectionFormat** +```java +Mono FakeApi.testQueryParameterCollectionFormat(pipeioutilhttpurlcontext) +``` + + + +To test the collection format in query parameters + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pipe** | [**List<String>**](String.md)| | + **ioutil** | [**List<String>**](String.md)| | + **http** | [**List<String>**](String.md)| | + **url** | [**List<String>**](String.md)| | + **context** | [**List<String>**](String.md)| | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + diff --git a/samples/client/petstore/java-micronaut-client/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java-micronaut-client/docs/FakeClassnameTags123Api.md new file mode 100644 index 00000000000..6cc84918111 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/FakeClassnameTags123Api.md @@ -0,0 +1,63 @@ +# FakeClassnameTags123Api + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case + + +## Creating FakeClassnameTags123Api + +To initiate an instance of `FakeClassnameTags123Api`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.FakeClassnameTags123Api; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(FakeClassnameTags123Api.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + FakeClassnameTags123Api fakeClassnameTags123Api; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **testClassname** +```java +Mono FakeClassnameTags123Api.testClassname(_body) +``` + +To test class name in snake case + +To test class name in snake case + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**ModelClient**](ModelClient.md)| client model | + + +### Return type +[**ModelClient**](ModelClient.md) + +### Authorization +* **[api_key_query](auth.md#api_key_query)** + +### HTTP request headers + - **Content-Type**: `application/json` + - **Accept**: `application/json` + diff --git a/samples/client/petstore/java-micronaut-client/docs/FileSchemaTestClass.md b/samples/client/petstore/java-micronaut-client/docs/FileSchemaTestClass.md new file mode 100644 index 00000000000..c9ba66f887b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/FileSchemaTestClass.md @@ -0,0 +1,17 @@ + + +# FileSchemaTestClass + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**file** | [`java.io.File`](java.io.File.md) | | [optional property] +**files** | [`List<java.io.File>`](java.io.File.md) | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/FormatTest.md b/samples/client/petstore/java-micronaut-client/docs/FormatTest.md new file mode 100644 index 00000000000..74c29bb97b2 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/FormatTest.md @@ -0,0 +1,29 @@ + + +# FormatTest + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**integer** | `Integer` | | [optional property] +**int32** | `Integer` | | [optional property] +**int64** | `Long` | | [optional property] +**number** | `BigDecimal` | | +**_float** | `Float` | | [optional property] +**_double** | `Double` | | [optional property] +**string** | `String` | | [optional property] +**_byte** | `byte[]` | | +**binary** | `File` | | [optional property] +**date** | `LocalDate` | | +**dateTime** | `LocalDateTime` | | [optional property] +**uuid** | `UUID` | | [optional property] +**password** | `String` | | +**bigDecimal** | `BigDecimal` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/HasOnlyReadOnly.md b/samples/client/petstore/java-micronaut-client/docs/HasOnlyReadOnly.md new file mode 100644 index 00000000000..c53bce80f62 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/HasOnlyReadOnly.md @@ -0,0 +1,17 @@ + + +# HasOnlyReadOnly + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**bar** | `String` | | [optional property] [readonly property] +**foo** | `String` | | [optional property] [readonly property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/MapTest.md b/samples/client/petstore/java-micronaut-client/docs/MapTest.md new file mode 100644 index 00000000000..8b868a1ae7e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/MapTest.md @@ -0,0 +1,27 @@ + + +# MapTest + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**mapMapOfString** | `Map<String, Map<String, String>>` | | [optional property] +**mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) | | [optional property] +**directMap** | `Map<String, Boolean>` | | [optional property] +**indirectMap** | `Map<String, Boolean>` | | [optional property] + + + +## Enum: Map<String, InnerEnum> + +Name | Value +---- | ----- +UPPER | `"UPPER"` +LOWER | `"lower"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-micronaut-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md new file mode 100644 index 00000000000..40f3a82effd --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -0,0 +1,18 @@ + + +# MixedPropertiesAndAdditionalPropertiesClass + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**uuid** | `UUID` | | [optional property] +**dateTime** | `LocalDateTime` | | [optional property] +**map** | [`Map<String, Animal>`](Animal.md) | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Model200Response.md b/samples/client/petstore/java-micronaut-client/docs/Model200Response.md new file mode 100644 index 00000000000..bc8078d0bed --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Model200Response.md @@ -0,0 +1,18 @@ + + +# Model200Response + +Model for testing model name starting with number + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `Integer` | | [optional property] +**propertyClass** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ModelApiResponse.md b/samples/client/petstore/java-micronaut-client/docs/ModelApiResponse.md new file mode 100644 index 00000000000..950119dc1f1 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ModelApiResponse.md @@ -0,0 +1,18 @@ + + +# ModelApiResponse + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**code** | `Integer` | | [optional property] +**type** | `String` | | [optional property] +**message** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ModelClient.md b/samples/client/petstore/java-micronaut-client/docs/ModelClient.md new file mode 100644 index 00000000000..74770bad073 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ModelClient.md @@ -0,0 +1,16 @@ + + +# ModelClient + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_client** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/ModelReturn.md b/samples/client/petstore/java-micronaut-client/docs/ModelReturn.md new file mode 100644 index 00000000000..f907f3a956b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ModelReturn.md @@ -0,0 +1,17 @@ + + +# ModelReturn + +Model for testing reserved words + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_return** | `Integer` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Name.md b/samples/client/petstore/java-micronaut-client/docs/Name.md new file mode 100644 index 00000000000..e9e41d13435 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Name.md @@ -0,0 +1,20 @@ + + +# Name + +Model for testing model name same as property name + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | `Integer` | | +**snakeCase** | `Integer` | | [optional property] [readonly property] +**property** | `String` | | [optional property] +**_123number** | `Integer` | | [optional property] [readonly property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/NumberOnly.md b/samples/client/petstore/java-micronaut-client/docs/NumberOnly.md new file mode 100644 index 00000000000..ff8408617c5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/NumberOnly.md @@ -0,0 +1,16 @@ + + +# NumberOnly + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**justNumber** | `BigDecimal` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Order.md b/samples/client/petstore/java-micronaut-client/docs/Order.md new file mode 100644 index 00000000000..2522ec781e4 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Order.md @@ -0,0 +1,30 @@ + + +# Order + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | `Long` | | [optional property] +**petId** | `Long` | | [optional property] +**quantity** | `Integer` | | [optional property] +**shipDate** | `LocalDateTime` | | [optional property] +**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional property] +**complete** | `Boolean` | | [optional property] + + + +## Enum: StatusEnum + +Name | Value +---- | ----- +PLACED | `"placed"` +APPROVED | `"approved"` +DELIVERED | `"delivered"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/OuterComposite.md b/samples/client/petstore/java-micronaut-client/docs/OuterComposite.md new file mode 100644 index 00000000000..dc004d557a5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/OuterComposite.md @@ -0,0 +1,18 @@ + + +# OuterComposite + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**myNumber** | `BigDecimal` | | [optional property] +**myString** | `String` | | [optional property] +**myBoolean** | `Boolean` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/OuterEnum.md b/samples/client/petstore/java-micronaut-client/docs/OuterEnum.md new file mode 100644 index 00000000000..1f9b723eb8e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/OuterEnum.md @@ -0,0 +1,15 @@ + + +# OuterEnum + +## Enum + + +* `PLACED` (value: `"placed"`) + +* `APPROVED` (value: `"approved"`) + +* `DELIVERED` (value: `"delivered"`) + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/Pet.md b/samples/client/petstore/java-micronaut-client/docs/Pet.md new file mode 100644 index 00000000000..6a18fe4238d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Pet.md @@ -0,0 +1,30 @@ + + +# Pet + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | `Long` | | [optional property] +**category** | [`Category`](Category.md) | | [optional property] +**name** | `String` | | +**photoUrls** | `Set<String>` | | +**tags** | [`List<Tag>`](Tag.md) | | [optional property] +**status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional property] + + + +## Enum: StatusEnum + +Name | Value +---- | ----- +AVAILABLE | `"available"` +PENDING | `"pending"` +SOLD | `"sold"` + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/PetApi.md b/samples/client/petstore/java-micronaut-client/docs/PetApi.md new file mode 100644 index 00000000000..44f7e649a26 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/PetApi.md @@ -0,0 +1,270 @@ +# PetApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image +[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required) + + +## Creating PetApi + +To initiate an instance of `PetApi`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.PetApi; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(PetApi.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + PetApi petApi; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **addPet** +```java +Mono PetApi.addPet(_body) +``` + +Add a new pet to the store + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | + + + + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: `application/json`, `application/xml` + - **Accept**: Not defined + + +# **deletePet** +```java +Mono PetApi.deletePet(petIdapiKey) +``` + +Deletes a pet + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | `Long`| Pet id to delete | + **apiKey** | `String`| | [optional parameter] + + + + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **findPetsByStatus** +```java +Mono> PetApi.findPetsByStatus(status) +``` + +Finds Pets by status + +Multiple status values can be provided with comma separated strings + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | [**List<String>**](String.md)| Status values that need to be considered for filter | [enum: `available`, `pending`, `sold`] + + +### Return type +[**List<Pet>**](Pet.md) + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **findPetsByTags** +```java +Mono> PetApi.findPetsByTags(tags) +``` + +Finds Pets by tags + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | [**Set<String>**](String.md)| Tags to filter by | + + +### Return type +[**Set<Pet>**](Pet.md) + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **getPetById** +```java +Mono PetApi.getPetById(petId) +``` + +Find pet by ID + +Returns a single pet + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | `Long`| ID of pet to return | + + +### Return type +[**Pet**](Pet.md) + +### Authorization +* **[api_key](auth.md#api_key)** + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **updatePet** +```java +Mono PetApi.updatePet(_body) +``` + +Update an existing pet + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | + + + + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: `application/json`, `application/xml` + - **Accept**: Not defined + + +# **updatePetWithForm** +```java +Mono PetApi.updatePetWithForm(petIdnamestatus) +``` + +Updates a pet in the store with form data + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | `Long`| ID of pet that needs to be updated | + **name** | `String`| Updated name of the pet | [optional parameter] + **status** | `String`| Updated status of the pet | [optional parameter] + + + + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: `application/x-www-form-urlencoded` + - **Accept**: Not defined + + +# **uploadFile** +```java +Mono PetApi.uploadFile(petIdadditionalMetadatafile) +``` + +uploads an image + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | `Long`| ID of pet to update | + **additionalMetadata** | `String`| Additional data to pass to server | [optional parameter] + **file** | `File`| file to upload | [optional parameter] + + +### Return type +[**ModelApiResponse**](ModelApiResponse.md) + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: `multipart/form-data` + - **Accept**: `application/json` + + +# **uploadFileWithRequiredFile** +```java +Mono PetApi.uploadFileWithRequiredFile(petIdrequiredFileadditionalMetadata) +``` + +uploads an image (required) + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | `Long`| ID of pet to update | + **requiredFile** | `File`| file to upload | + **additionalMetadata** | `String`| Additional data to pass to server | [optional parameter] + + +### Return type +[**ModelApiResponse**](ModelApiResponse.md) + +### Authorization +* **[petstore_auth](auth.md#petstore_auth)**, scopes: `write:pets`, `read:pets` + +### HTTP request headers + - **Content-Type**: `multipart/form-data` + - **Accept**: `application/json` + diff --git a/samples/client/petstore/java-micronaut-client/docs/ReadOnlyFirst.md b/samples/client/petstore/java-micronaut-client/docs/ReadOnlyFirst.md new file mode 100644 index 00000000000..503ba210dbf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/ReadOnlyFirst.md @@ -0,0 +1,17 @@ + + +# ReadOnlyFirst + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**bar** | `String` | | [optional property] [readonly property] +**baz** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/SpecialModelName.md b/samples/client/petstore/java-micronaut-client/docs/SpecialModelName.md new file mode 100644 index 00000000000..88dbe302799 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/SpecialModelName.md @@ -0,0 +1,16 @@ + + +# SpecialModelName + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**$specialPropertyName** | `Long` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/StoreApi.md b/samples/client/petstore/java-micronaut-client/docs/StoreApi.md new file mode 100644 index 00000000000..eb32b4a754c --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/StoreApi.md @@ -0,0 +1,134 @@ +# StoreApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet + + +## Creating StoreApi + +To initiate an instance of `StoreApi`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.StoreApi; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(StoreApi.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + StoreApi storeApi; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **deleteOrder** +```java +Mono StoreApi.deleteOrder(orderId) +``` + +Delete purchase order by ID + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | `String`| ID of the order that needs to be deleted | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **getInventory** +```java +Mono> StoreApi.getInventory() +``` + +Returns pet inventories by status + +Returns a map of status codes to quantities + + + +### Return type +`Map<String, Integer>` + +### Authorization +* **[api_key](auth.md#api_key)** + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/json` + + +# **getOrderById** +```java +Mono StoreApi.getOrderById(orderId) +``` + +Find purchase order by ID + +For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | `Long`| ID of pet that needs to be fetched | + + +### Return type +[**Order**](Order.md) + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **placeOrder** +```java +Mono StoreApi.placeOrder(_body) +``` + +Place an order for a pet + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**Order**](Order.md)| order placed for purchasing the pet | + + +### Return type +[**Order**](Order.md) + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + diff --git a/samples/client/petstore/java-micronaut-client/docs/Tag.md b/samples/client/petstore/java-micronaut-client/docs/Tag.md new file mode 100644 index 00000000000..7de5f5be77f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/Tag.md @@ -0,0 +1,17 @@ + + +# Tag + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | `Long` | | [optional property] +**name** | `String` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/TypeHolderDefault.md b/samples/client/petstore/java-micronaut-client/docs/TypeHolderDefault.md new file mode 100644 index 00000000000..1cd7787e495 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/TypeHolderDefault.md @@ -0,0 +1,20 @@ + + +# TypeHolderDefault + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**stringItem** | `String` | | +**numberItem** | `BigDecimal` | | +**integerItem** | `Integer` | | +**boolItem** | `Boolean` | | +**arrayItem** | `List<Integer>` | | + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/TypeHolderExample.md b/samples/client/petstore/java-micronaut-client/docs/TypeHolderExample.md new file mode 100644 index 00000000000..805608ae2b9 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/TypeHolderExample.md @@ -0,0 +1,21 @@ + + +# TypeHolderExample + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**stringItem** | `String` | | +**numberItem** | `BigDecimal` | | +**floatItem** | `Float` | | +**integerItem** | `Integer` | | +**boolItem** | `Boolean` | | +**arrayItem** | `List<Integer>` | | + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/User.md b/samples/client/petstore/java-micronaut-client/docs/User.md new file mode 100644 index 00000000000..73274c63f19 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/User.md @@ -0,0 +1,23 @@ + + +# User + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | `Long` | | [optional property] +**username** | `String` | | [optional property] +**firstName** | `String` | | [optional property] +**lastName** | `String` | | [optional property] +**email** | `String` | | [optional property] +**password** | `String` | | [optional property] +**phone** | `String` | | [optional property] +**userStatus** | `Integer` | User Status | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/UserApi.md b/samples/client/petstore/java-micronaut-client/docs/UserApi.md new file mode 100644 index 00000000000..3eb55a90d4f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/UserApi.md @@ -0,0 +1,226 @@ +# UserApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **POST** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user + + +## Creating UserApi + +To initiate an instance of `UserApi`, you can use micronaut's `ApplicationContext`: +```java +/* imports +import io.micronaut.runtime.Micronaut; +import io.micronaut.context.ApplicationContext; +import org.openapitools.api.UserApi; +*/ + +ApplicationContext context = Micronaut.run(/* ... */); +PetApi apiInstance = context.getBean(UserApi.class); +``` + +Or the `@Inject` annotation: +```java +@Singleton +class MyClass { + @Inject + UserApi userApi; + + /* ... use the injected variable */ +} +``` +Note that the class needs to be annotated with one of Micronaut's [scope annotations](https://docs.micronaut.io/latest/guide/#scopes) like `Singleton` in order to be processed. + +More information can be found inside [Inversion of Control guide section](https://docs.micronaut.io/latest/guide/#ioc). + + +# **createUser** +```java +Mono UserApi.createUser(_body) +``` + +Create user + +This can only be done by the logged in user. + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**User**](User.md)| Created user object | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **createUsersWithArrayInput** +```java +Mono UserApi.createUsersWithArrayInput(_body) +``` + +Creates list of users with given input array + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**List<User>**](User.md)| List of user object | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **createUsersWithListInput** +```java +Mono UserApi.createUsersWithListInput(_body) +``` + +Creates list of users with given input array + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **_body** | [**List<User>**](User.md)| List of user object | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **deleteUser** +```java +Mono UserApi.deleteUser(username) +``` + +Delete user + +This can only be done by the logged in user. + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | `String`| The name that needs to be deleted | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **getUserByName** +```java +Mono UserApi.getUserByName(username) +``` + +Get user by user name + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | `String`| The name that needs to be fetched. Use user1 for testing. | + + +### Return type +[**User**](User.md) + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **loginUser** +```java +Mono UserApi.loginUser(usernamepassword) +``` + +Logs user into the system + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | `String`| The user name for login | + **password** | `String`| The password for login in clear text | + + +### Return type +`String` + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: `application/xml`, `application/json` + + +# **logoutUser** +```java +Mono UserApi.logoutUser() +``` + +Logs out current logged in user session + + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **updateUser** +```java +Mono UserApi.updateUser(username_body) +``` + +Updated user + +This can only be done by the logged in user. + +### Parameters +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | `String`| name that need to be deleted | + **_body** | [**User**](User.md)| Updated user object | + + + + + + +### HTTP request headers + - **Content-Type**: Not defined + - **Accept**: Not defined + diff --git a/samples/client/petstore/java-micronaut-client/docs/XmlItem.md b/samples/client/petstore/java-micronaut-client/docs/XmlItem.md new file mode 100644 index 00000000000..2f07c8efbf6 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/XmlItem.md @@ -0,0 +1,44 @@ + + +# XmlItem + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**attributeString** | `String` | | [optional property] +**attributeNumber** | `BigDecimal` | | [optional property] +**attributeInteger** | `Integer` | | [optional property] +**attributeBoolean** | `Boolean` | | [optional property] +**wrappedArray** | `List<Integer>` | | [optional property] +**nameString** | `String` | | [optional property] +**nameNumber** | `BigDecimal` | | [optional property] +**nameInteger** | `Integer` | | [optional property] +**nameBoolean** | `Boolean` | | [optional property] +**nameArray** | `List<Integer>` | | [optional property] +**nameWrappedArray** | `List<Integer>` | | [optional property] +**prefixString** | `String` | | [optional property] +**prefixNumber** | `BigDecimal` | | [optional property] +**prefixInteger** | `Integer` | | [optional property] +**prefixBoolean** | `Boolean` | | [optional property] +**prefixArray** | `List<Integer>` | | [optional property] +**prefixWrappedArray** | `List<Integer>` | | [optional property] +**namespaceString** | `String` | | [optional property] +**namespaceNumber** | `BigDecimal` | | [optional property] +**namespaceInteger** | `Integer` | | [optional property] +**namespaceBoolean** | `Boolean` | | [optional property] +**namespaceArray** | `List<Integer>` | | [optional property] +**namespaceWrappedArray** | `List<Integer>` | | [optional property] +**prefixNsString** | `String` | | [optional property] +**prefixNsNumber** | `BigDecimal` | | [optional property] +**prefixNsInteger** | `Integer` | | [optional property] +**prefixNsBoolean** | `Boolean` | | [optional property] +**prefixNsArray** | `List<Integer>` | | [optional property] +**prefixNsWrappedArray** | `List<Integer>` | | [optional property] + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/docs/auth.md b/samples/client/petstore/java-micronaut-client/docs/auth.md new file mode 100644 index 00000000000..97f37d68202 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/docs/auth.md @@ -0,0 +1,26 @@ +# Authorization methods + +# api_key +Authorization method is of **api key type**. The parameter `api_key` is located in `header`. + +It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features. + +# api_key_query +Authorization method is of **api key type**. The parameter `api_key_query` is located in `query`. + +It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features. + +# http_basic_test +Authorization method is of **basic auth**. + +It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features. + +# petstore_auth +Authorization method is **OAuth2** with `implicit` flow. +The scopes are: + * `write:pets` + * `read:pets` + +It can be configured in the [application.yml](src/main/resources/application.yml) using Micronaut security features. + +More information on configuring can be found in [Micronaut Security Guide](https://micronaut-projects.github.io/micronaut-security/latest/guide/#oauth). diff --git a/samples/client/petstore/java-micronaut-client/gradle.properties b/samples/client/petstore/java-micronaut-client/gradle.properties new file mode 100644 index 00000000000..4804e049014 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/gradle.properties @@ -0,0 +1 @@ +micronautVersion=3.0.0-M5 \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..f2e1eb1fd47 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip diff --git a/samples/client/petstore/java-micronaut-client/gradlew b/samples/client/petstore/java-micronaut-client/gradlew new file mode 100644 index 00000000000..4f906e0c811 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java-micronaut-client/gradlew.bat b/samples/client/petstore/java-micronaut-client/gradlew.bat new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java-micronaut-client/hello.txt b/samples/client/petstore/java-micronaut-client/hello.txt new file mode 100644 index 00000000000..6769dd60bdf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/hello.txt @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/mvnw b/samples/client/petstore/java-micronaut-client/mvnw new file mode 100644 index 00000000000..a16b5431b4c --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/samples/client/petstore/java-micronaut-client/mvnw.bat b/samples/client/petstore/java-micronaut-client/mvnw.bat new file mode 100644 index 00000000000..c8d43372c98 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/mvnw.bat @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/samples/client/petstore/java-micronaut-client/pom.xml b/samples/client/petstore/java-micronaut-client/pom.xml new file mode 100644 index 00000000000..c64bc3bb07c --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/pom.xml @@ -0,0 +1,174 @@ + + + 4.0.0 + org.openapitools + petstore-micronaut + 1.0.0 + ${packaging} + + + io.micronaut + micronaut-parent + 3.0.0-M5 + + + + jar + 1.8 + + + 3.0.0-M5 + org.openapitools.Application + netty + 1.5.21 + + + + + central + https://repo.maven.apache.org/maven2 + + + + + + io.micronaut + micronaut-inject + compile + + + io.micronaut + micronaut-validation + compile + + + io.micronaut + micronaut-inject-groovy + test + + + org.spockframework + spock-core + test + + + org.codehaus.groovy + groovy-all + + + + + io.micronaut.test + micronaut-test-spock + test + + + io.micronaut + micronaut-http-client + compile + + + io.micronaut + micronaut-http-server-netty + compile + + + io.micronaut + micronaut-runtime + compile + + + io.micronaut.reactor + micronaut-reactor + compile + + + io.micronaut.security + micronaut-security + compile + + + io.micronaut.security + micronaut-security-oauth2 + compile + + + ch.qos.logback + logback-classic + runtime + + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + + + + + + io.micronaut.build + micronaut-maven-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + io.micronaut + micronaut-http-validation + ${micronaut.version} + + + io.micronaut.security + micronaut-security-annotations + ${micronaut.security.version} + + + + -Amicronaut.processing.group=org.openapitools + -Amicronaut.processing.module=petstore-micronaut + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Spec.* + **/*Test.* + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.9.0 + + + + addSources + generateStubs + compile + removeStubs + addTestSources + generateTestStubs + compileTests + removeTestStubs + + + + + + + + diff --git a/samples/client/petstore/java-micronaut-client/settings.gradle b/samples/client/petstore/java-micronaut-client/settings.gradle new file mode 100644 index 00000000000..c9092ffe7ac --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "petstore-micronaut" \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/AnotherFakeApi.java new file mode 100644 index 00000000000..09c1c9fb397 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -0,0 +1,48 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import org.openapitools.model.ModelClient; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface AnotherFakeApi { + + /** + * To test special tags + * To test special tags and operation ID starting with number + * + * @param _body client model (required) + * @return ModelClient + */ + @Patch(uri="/another-fake/dummy") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono call123testSpecialTags( + @Body @Valid @NotNull ModelClient _body + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java new file mode 100644 index 00000000000..3f2bb9df3da --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java @@ -0,0 +1,280 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import java.math.BigDecimal; +import java.io.File; +import org.openapitools.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.LocalDateTime; +import org.openapitools.model.ModelClient; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface FakeApi { + + /** + * creates an XmlItem + * this route creates an XmlItem + * + * @param xmlItem XmlItem Body (required) + */ + @Post(uri="/fake/create_xml_item") + @Produces(value={"application/xml"}) + @Consumes(value={"application/json"}) + Mono createXmlItem( + @Body @Valid @NotNull XmlItem xmlItem + ); + + /** + * Test serialization of outer boolean types + * + * @param _body Input boolean as post body (optional) + * @return Boolean + */ + @Post(uri="/fake/outer/boolean") + @Produces(value={"*/*"}) + @Consumes(value={"*/*"}) + Mono fakeOuterBooleanSerialize( + @Body Boolean _body + ); + + /** + * Test serialization of object with outer number type + * + * @param _body Input composite as post body (optional) + * @return OuterComposite + */ + @Post(uri="/fake/outer/composite") + @Produces(value={"*/*"}) + @Consumes(value={"*/*"}) + Mono fakeOuterCompositeSerialize( + @Body @Valid OuterComposite _body + ); + + /** + * Test serialization of outer number types + * + * @param _body Input number as post body (optional) + * @return BigDecimal + */ + @Post(uri="/fake/outer/number") + @Produces(value={"*/*"}) + @Consumes(value={"*/*"}) + Mono fakeOuterNumberSerialize( + @Body BigDecimal _body + ); + + /** + * Test serialization of outer string types + * + * @param _body Input string as post body (optional) + * @return String + */ + @Post(uri="/fake/outer/string") + @Produces(value={"*/*"}) + @Consumes(value={"*/*"}) + Mono fakeOuterStringSerialize( + @Body String _body + ); + + /** + * For this test, the body for this request much reference a schema named `File`. + * + * @param _body (required) + */ + @Put(uri="/fake/body-with-file-schema") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono testBodyWithFileSchema( + @Body @Valid @NotNull FileSchemaTestClass _body + ); + + /** + * testBodyWithQueryParams + * + * @param query (required) + * @param _body (required) + */ + @Put(uri="/fake/body-with-query-params") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono testBodyWithQueryParams( + @QueryParam(name="query") @NotNull String query, + @Body @Valid @NotNull User _body + ); + + /** + * To test \"client\" model + * To test \"client\" model + * + * @param _body client model (required) + * @return ModelClient + */ + @Patch(uri="/fake") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono testClientModel( + @Body @Valid @NotNull ModelClient _body + ); + + /** + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * + * @param number None (required) + * @param _double None (required) + * @param patternWithoutDelimiter None (required) + * @param _byte None (required) + * @param integer None (optional) + * @param int32 None (optional) + * @param int64 None (optional) + * @param _float None (optional) + * @param string None (optional) + * @param binary None (optional) + * @param date None (optional) + * @param dateTime None (optional) + * @param password None (optional) + * @param paramCallback None (optional) + */ + @Post(uri="/fake") + @Produces(value={"application/x-www-form-urlencoded"}) + @Consumes(value={"application/json"}) + Mono testEndpointParameters( + @NotNull @DecimalMin("32.1") @DecimalMax("543.2") BigDecimal number, + @NotNull @DecimalMin("67.8") @DecimalMax("123.4") Double _double, + @NotNull @Pattern(regexp="^[A-Z].*") String patternWithoutDelimiter, + @NotNull byte[] _byte, + @Min(10) @Max(100) Integer integer, + @Min(20) @Max(200) Integer int32, + Long int64, + @DecimalMax("987.6") Float _float, + @Pattern(regexp="/[a-z]/i") String string, + File binary, + @Format("yyyy-MM-dd") LocalDate date, + @Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") LocalDateTime dateTime, + @Size(min=10, max=64) String password, + String paramCallback + ); + + /** + * To test enum parameters + * To test enum parameters + * + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) + * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) + * @param enumQueryStringArray Query parameter enum test (string array) (optional) + * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) + * @param enumQueryInteger Query parameter enum test (double) (optional) + * @param enumQueryDouble Query parameter enum test (double) (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + */ + @Get(uri="/fake") + @Produces(value={"application/x-www-form-urlencoded"}) + @Consumes(value={"application/json"}) + Mono testEnumParameters( + @Header(name="enum_header_string_array") List enumHeaderStringArray, + @Header(name="enum_header_string", defaultValue="-efg") String enumHeaderString, + @QueryParam(name="enum_query_string_array", format=QueryParam.Format.CSV) List enumQueryStringArray, + @QueryParam(name="enum_query_string", defaultValue="-efg") String enumQueryString, + @QueryParam(name="enum_query_integer") Integer enumQueryInteger, + @QueryParam(name="enum_query_double") Double enumQueryDouble, + List enumFormStringArray, + String enumFormString + ); + + /** + * Fake endpoint to test group parameters (optional) + * Fake endpoint to test group parameters (optional) + * + * @param requiredStringGroup Required String in group parameters (required) + * @param requiredBooleanGroup Required Boolean in group parameters (required) + * @param requiredInt64Group Required Integer in group parameters (required) + * @param stringGroup String in group parameters (optional) + * @param booleanGroup Boolean in group parameters (optional) + * @param int64Group Integer in group parameters (optional) + */ + @Delete(uri="/fake") + @Consumes(value={"application/json"}) + Mono testGroupParameters( + @QueryParam(name="required_string_group") @NotNull Integer requiredStringGroup, + @Header(name="required_boolean_group") @NotNull Boolean requiredBooleanGroup, + @QueryParam(name="required_int64_group") @NotNull Long requiredInt64Group, + @QueryParam(name="string_group") Integer stringGroup, + @Header(name="boolean_group") Boolean booleanGroup, + @QueryParam(name="int64_group") Long int64Group + ); + + /** + * test inline additionalProperties + * + * @param param request body (required) + */ + @Post(uri="/fake/inline-additionalProperties") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono testInlineAdditionalProperties( + @Body @NotNull Map param + ); + + /** + * test json serialization of form data + * + * @param param field1 (required) + * @param param2 field2 (required) + */ + @Get(uri="/fake/jsonFormData") + @Produces(value={"application/x-www-form-urlencoded"}) + @Consumes(value={"application/json"}) + Mono testJsonFormData( + @NotNull String param, + @NotNull String param2 + ); + + /** + * To test the collection format in query parameters + * + * @param pipe (required) + * @param ioutil (required) + * @param http (required) + * @param url (required) + * @param context (required) + */ + @Put(uri="/fake/test-query-paramters") + @Consumes(value={"application/json"}) + Mono testQueryParameterCollectionFormat( + @QueryParam(name="pipe", format=QueryParam.Format.CSV) @NotNull List pipe, + @QueryParam(name="ioutil", format=QueryParam.Format.CSV) @NotNull List ioutil, + @QueryParam(name="http", format=QueryParam.Format.SSV) @NotNull List http, + @QueryParam(name="url", format=QueryParam.Format.CSV) @NotNull List url, + @QueryParam(name="context", format=QueryParam.Format.MULTI) @NotNull List context + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java new file mode 100644 index 00000000000..e586776bc7d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -0,0 +1,48 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import org.openapitools.model.ModelClient; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface FakeClassnameTags123Api { + + /** + * To test class name in snake case + * To test class name in snake case + * + * @param _body client model (required) + * @return ModelClient + */ + @Patch(uri="/fake_classname_test") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono testClassname( + @Body @Valid @NotNull ModelClient _body + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/PetApi.java new file mode 100644 index 00000000000..e570abe961d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/PetApi.java @@ -0,0 +1,163 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; +import java.util.Set; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface PetApi { + + /** + * Add a new pet to the store + * + * @param _body Pet object that needs to be added to the store (required) + */ + @Post(uri="/pet") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono addPet( + @Body @Valid @NotNull Pet _body + ); + + /** + * Deletes a pet + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + */ + @Delete(uri="/pet/{petId}") + @Consumes(value={"application/json"}) + Mono deletePet( + @PathVariable(name="petId") @NotNull Long petId, + @Header(name="api_key") String apiKey + ); + + /** + * Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return List<Pet> + */ + @Get(uri="/pet/findByStatus") + @Consumes(value={"application/json"}) + Mono> findPetsByStatus( + @QueryParam(name="status", format=QueryParam.Format.CSV) @NotNull List status + ); + + /** + * Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return Set<Pet> + */ + @Get(uri="/pet/findByTags") + @Consumes(value={"application/json"}) + Mono> findPetsByTags( + @QueryParam(name="tags", format=QueryParam.Format.CSV) @NotNull Set tags + ); + + /** + * Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return Pet + */ + @Get(uri="/pet/{petId}") + @Consumes(value={"application/json"}) + Mono getPetById( + @PathVariable(name="petId") @NotNull Long petId + ); + + /** + * Update an existing pet + * + * @param _body Pet object that needs to be added to the store (required) + */ + @Put(uri="/pet") + @Produces(value={"application/json"}) + @Consumes(value={"application/json"}) + Mono updatePet( + @Body @Valid @NotNull Pet _body + ); + + /** + * Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + */ + @Post(uri="/pet/{petId}") + @Produces(value={"application/x-www-form-urlencoded"}) + @Consumes(value={"application/json"}) + Mono updatePetWithForm( + @PathVariable(name="petId") @NotNull Long petId, + String name, + String status + ); + + /** + * uploads an image + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return ModelApiResponse + */ + @Post(uri="/pet/{petId}/uploadImage") + @Produces(value={"multipart/form-data"}) + @Consumes(value={"application/json"}) + Mono uploadFile( + @PathVariable(name="petId") @NotNull Long petId, + String additionalMetadata, + File file + ); + + /** + * uploads an image (required) + * + * @param petId ID of pet to update (required) + * @param requiredFile file to upload (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @return ModelApiResponse + */ + @Post(uri="/fake/{petId}/uploadImageWithRequiredFile") + @Produces(value={"multipart/form-data"}) + @Consumes(value={"application/json"}) + Mono uploadFileWithRequiredFile( + @PathVariable(name="petId") @NotNull Long petId, + @NotNull File requiredFile, + String additionalMetadata + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java new file mode 100644 index 00000000000..5a0bb8af787 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java @@ -0,0 +1,82 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import org.openapitools.model.Order; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface StoreApi { + + /** + * Delete purchase order by ID + * 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) + */ + @Delete(uri="/store/order/{order_id}") + @Consumes(value={"application/json"}) + Mono deleteOrder( + @PathVariable(name="order_id") @NotNull String orderId + ); + + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return Map<String, Integer> + */ + @Get(uri="/store/inventory") + @Consumes(value={"application/json"}) + Mono> getInventory(); + + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return Order + */ + @Get(uri="/store/order/{order_id}") + @Consumes(value={"application/json"}) + Mono getOrderById( + @PathVariable(name="order_id") @NotNull @Min(1L) @Max(5L) Long orderId + ); + + /** + * Place an order for a pet + * + * @param _body order placed for purchasing the pet (required) + * @return Order + */ + @Post(uri="/store/order") + @Produces(value={"*/*"}) + @Consumes(value={"application/json"}) + Mono placeOrder( + @Body @Valid @NotNull Order _body + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/UserApi.java new file mode 100644 index 00000000000..e29a340990c --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/UserApi.java @@ -0,0 +1,132 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.api; + +import io.micronaut.http.annotation.*; +import io.micronaut.core.annotation.*; +import io.micronaut.http.client.annotation.Client; +import org.openapitools.query.QueryParam; +import io.micronaut.core.convert.format.Format; +import reactor.core.publisher.Mono; +import org.openapitools.model.User; +import javax.annotation.Generated; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Client("${base-path}") +public interface UserApi { + + /** + * Create user + * This can only be done by the logged in user. + * + * @param _body Created user object (required) + */ + @Post(uri="/user") + @Produces(value={"*/*"}) + @Consumes(value={"application/json"}) + Mono createUser( + @Body @Valid @NotNull User _body + ); + + /** + * Creates list of users with given input array + * + * @param _body List of user object (required) + */ + @Post(uri="/user/createWithArray") + @Produces(value={"*/*"}) + @Consumes(value={"application/json"}) + Mono createUsersWithArrayInput( + @Body @NotNull List _body + ); + + /** + * Creates list of users with given input array + * + * @param _body List of user object (required) + */ + @Post(uri="/user/createWithList") + @Produces(value={"*/*"}) + @Consumes(value={"application/json"}) + Mono createUsersWithListInput( + @Body @NotNull List _body + ); + + /** + * Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + */ + @Delete(uri="/user/{username}") + @Consumes(value={"application/json"}) + Mono deleteUser( + @PathVariable(name="username") @NotNull String username + ); + + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return User + */ + @Get(uri="/user/{username}") + @Consumes(value={"application/json"}) + Mono getUserByName( + @PathVariable(name="username") @NotNull String username + ); + + /** + * Logs user into the system + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return String + */ + @Get(uri="/user/login") + @Consumes(value={"application/json"}) + Mono loginUser( + @QueryParam(name="username") @NotNull String username, + @QueryParam(name="password") @NotNull String password + ); + + /** + * Logs out current logged in user session + * + */ + @Get(uri="/user/logout") + @Consumes(value={"application/json"}) + Mono logoutUser(); + + /** + * Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param _body Updated user object (required) + */ + @Put(uri="/user/{username}") + @Produces(value={"*/*"}) + @Consumes(value={"application/json"}) + Mono updateUser( + @PathVariable(name="username") @NotNull String username, + @Body @Valid @NotNull User _body + ); +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java new file mode 100644 index 00000000000..c727e3389ab --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesAnyType + */ +@JsonPropertyOrder({ + AdditionalPropertiesAnyType.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesAnyType") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesAnyType extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesAnyType name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; + return Objects.equals(this.name, additionalPropertiesAnyType.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesAnyType {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java new file mode 100644 index 00000000000..749c516be0a --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -0,0 +1,104 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesArray + */ +@JsonPropertyOrder({ + AdditionalPropertiesArray.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesArray") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesArray extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesArray name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; + return Objects.equals(this.name, additionalPropertiesArray.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesArray {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java new file mode 100644 index 00000000000..859739c31a5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesBoolean + */ +@JsonPropertyOrder({ + AdditionalPropertiesBoolean.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesBoolean") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesBoolean extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesBoolean name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; + return Objects.equals(this.name, additionalPropertiesBoolean.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesBoolean {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java new file mode 100644 index 00000000000..aef32243b4e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -0,0 +1,457 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesClass + */ +@JsonPropertyOrder({ + AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3 +}) +@JsonTypeName("AdditionalPropertiesClass") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesClass { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + private Map mapString = null; + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + private Map mapNumber = null; + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + private Map mapInteger = null; + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + private Map mapBoolean = null; + + public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; + private Map> mapArrayInteger = null; + + public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; + private Map> mapArrayAnytype = null; + + public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; + private Map> mapMapString = null; + + public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; + private Map> mapMapAnytype = null; + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + private Object anytype1; + + public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2"; + private Object anytype2; + + public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3"; + private Object anytype3; + + public AdditionalPropertiesClass mapString(Map mapString) { + this.mapString = mapString; + return this; + } + + public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap(); + } + this.mapString.put(key, mapStringItem); + return this; + } + + /** + * Get mapString + * @return mapString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMapString() { + return mapString; + } + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(Map mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClass mapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap(); + } + this.mapNumber.put(key, mapNumberItem); + return this; + } + + /** + * Get mapNumber + * @return mapNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMapNumber() { + return mapNumber; + } + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClass mapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap(); + } + this.mapInteger.put(key, mapIntegerItem); + return this; + } + + /** + * Get mapInteger + * @return mapInteger + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMapInteger() { + return mapInteger; + } + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap(); + } + this.mapBoolean.put(key, mapBooleanItem); + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMapBoolean() { + return mapBoolean; + } + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + return this; + } + + public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap>(); + } + this.mapArrayInteger.put(key, mapArrayIntegerItem); + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map> getMapArrayInteger() { + return mapArrayInteger; + } + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap>(); + } + this.mapArrayAnytype.put(key, mapArrayAnytypeItem); + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map> getMapArrayAnytype() { + return mapArrayAnytype; + } + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertiesClass mapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + return this; + } + + public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap>(); + } + this.mapMapString.put(key, mapMapStringItem); + return this; + } + + /** + * Get mapMapString + * @return mapMapString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map> getMapMapString() { + return mapMapString; + } + + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + return this; + } + + public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap>(); + } + this.mapMapAnytype.put(key, mapMapAnytypeItem); + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map> getMapMapAnytype() { + return mapMapAnytype; + } + + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertiesClass anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Object getAnytype1() { + return anytype1; + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClass anytype2(Object anytype2) { + this.anytype2 = anytype2; + return this; + } + + /** + * Get anytype2 + * @return anytype2 + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Object getAnytype2() { + return anytype2; + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype2(Object anytype2) { + this.anytype2 = anytype2; + } + + public AdditionalPropertiesClass anytype3(Object anytype3) { + this.anytype3 = anytype3; + return this; + } + + /** + * Get anytype3 + * @return anytype3 + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Object getAnytype3() { + return anytype3; + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype3(Object anytype3) { + this.anytype3 = anytype3; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; + return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClass {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); + sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java new file mode 100644 index 00000000000..5d6f4bcec0f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesInteger + */ +@JsonPropertyOrder({ + AdditionalPropertiesInteger.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesInteger") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesInteger extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesInteger name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; + return Objects.equals(this.name, additionalPropertiesInteger.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesInteger {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java new file mode 100644 index 00000000000..88dfc96af1b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -0,0 +1,104 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesNumber + */ +@JsonPropertyOrder({ + AdditionalPropertiesNumber.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesNumber") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesNumber extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesNumber name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; + return Objects.equals(this.name, additionalPropertiesNumber.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesNumber {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java new file mode 100644 index 00000000000..393746a2f1d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesObject + */ +@JsonPropertyOrder({ + AdditionalPropertiesObject.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesObject") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesObject extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesObject name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; + return Objects.equals(this.name, additionalPropertiesObject.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesObject {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java new file mode 100644 index 00000000000..cefd74bd15d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesString + */ +@JsonPropertyOrder({ + AdditionalPropertiesString.JSON_PROPERTY_NAME +}) +@JsonTypeName("AdditionalPropertiesString") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class AdditionalPropertiesString extends HashMap { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public AdditionalPropertiesString name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; + return Objects.equals(this.name, additionalPropertiesString.name) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(name, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesString {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java new file mode 100644 index 00000000000..5225322d5c8 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java @@ -0,0 +1,137 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Animal + */ +@JsonPropertyOrder({ + Animal.JSON_PROPERTY_CLASS_NAME, + Animal.JSON_PROPERTY_COLOR +}) +@JsonTypeName("Animal") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"), + @JsonSubTypes.Type(value = Cat.class, name = "Cat"), + @JsonSubTypes.Type(value = Dog.class, name = "Dog"), +}) + +@Introspected +public class Animal { + public static final String JSON_PROPERTY_CLASS_NAME = "className"; + protected String className; + + public static final String JSON_PROPERTY_COLOR = "color"; + private String color = "red"; + + public Animal className(String className) { + this.className = className; + return this; + } + + /** + * Get className + * @return className + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getClassName() { + return className; + } + + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setClassName(String className) { + this.className = className; + } + + public Animal color(String color) { + this.color = color; + return this; + } + + /** + * Get color + * @return color + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_COLOR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getColor() { + return color; + } + + @JsonProperty(JSON_PROPERTY_COLOR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setColor(String color) { + this.color = color; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Animal animal = (Animal) o; + return Objects.equals(this.className, animal.className) && + Objects.equals(this.color, animal.color); + } + + @Override + public int hashCode() { + return Objects.hash(className, color); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + sb.append(" className: ").append(toIndentedString(className)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java new file mode 100644 index 00000000000..0388c7c5ae6 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -0,0 +1,110 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ArrayOfArrayOfNumberOnly + */ +@JsonPropertyOrder({ + ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER +}) +@JsonTypeName("ArrayOfArrayOfNumberOnly") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ArrayOfArrayOfNumberOnly { + public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; + private List> arrayArrayNumber = null; + + public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { + this.arrayArrayNumber = arrayArrayNumber; + return this; + } + + public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { + if (this.arrayArrayNumber == null) { + this.arrayArrayNumber = new ArrayList>(); + } + this.arrayArrayNumber.add(arrayArrayNumberItem); + return this; + } + + /** + * Get arrayArrayNumber + * @return arrayArrayNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List> getArrayArrayNumber() { + return arrayArrayNumber; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayArrayNumber(List> arrayArrayNumber) { + this.arrayArrayNumber = arrayArrayNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; + return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); + } + + @Override + public int hashCode() { + return Objects.hash(arrayArrayNumber); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayOfArrayOfNumberOnly {\n"); + sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java new file mode 100644 index 00000000000..721d788bd90 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -0,0 +1,110 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ArrayOfNumberOnly + */ +@JsonPropertyOrder({ + ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER +}) +@JsonTypeName("ArrayOfNumberOnly") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ArrayOfNumberOnly { + public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; + private List arrayNumber = null; + + public ArrayOfNumberOnly arrayNumber(List arrayNumber) { + this.arrayNumber = arrayNumber; + return this; + } + + public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { + if (this.arrayNumber == null) { + this.arrayNumber = new ArrayList(); + } + this.arrayNumber.add(arrayNumberItem); + return this; + } + + /** + * Get arrayNumber + * @return arrayNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getArrayNumber() { + return arrayNumber; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayNumber(List arrayNumber) { + this.arrayNumber = arrayNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; + return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); + } + + @Override + public int hashCode() { + return Objects.hash(arrayNumber); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayOfNumberOnly {\n"); + sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java new file mode 100644 index 00000000000..07578136d1e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java @@ -0,0 +1,184 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.model.ReadOnlyFirst; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ArrayTest + */ +@JsonPropertyOrder({ + ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING, + ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, + ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL +}) +@JsonTypeName("ArrayTest") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ArrayTest { + public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; + private List arrayOfString = null; + + public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; + private List> arrayArrayOfInteger = null; + + public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; + private List> arrayArrayOfModel = null; + + public ArrayTest arrayOfString(List arrayOfString) { + this.arrayOfString = arrayOfString; + return this; + } + + public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { + if (this.arrayOfString == null) { + this.arrayOfString = new ArrayList(); + } + this.arrayOfString.add(arrayOfStringItem); + return this; + } + + /** + * Get arrayOfString + * @return arrayOfString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getArrayOfString() { + return arrayOfString; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayOfString(List arrayOfString) { + this.arrayOfString = arrayOfString; + } + + public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { + this.arrayArrayOfInteger = arrayArrayOfInteger; + return this; + } + + public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { + if (this.arrayArrayOfInteger == null) { + this.arrayArrayOfInteger = new ArrayList>(); + } + this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); + return this; + } + + /** + * Get arrayArrayOfInteger + * @return arrayArrayOfInteger + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List> getArrayArrayOfInteger() { + return arrayArrayOfInteger; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { + this.arrayArrayOfInteger = arrayArrayOfInteger; + } + + public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { + this.arrayArrayOfModel = arrayArrayOfModel; + return this; + } + + public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { + if (this.arrayArrayOfModel == null) { + this.arrayArrayOfModel = new ArrayList>(); + } + this.arrayArrayOfModel.add(arrayArrayOfModelItem); + return this; + } + + /** + * Get arrayArrayOfModel + * @return arrayArrayOfModel + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List> getArrayArrayOfModel() { + return arrayArrayOfModel; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayArrayOfModel(List> arrayArrayOfModel) { + this.arrayArrayOfModel = arrayArrayOfModel; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayTest arrayTest = (ArrayTest) o; + return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && + Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && + Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); + } + + @Override + public int hashCode() { + return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayTest {\n"); + sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); + sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); + sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java new file mode 100644 index 00000000000..badc9384314 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java @@ -0,0 +1,138 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.BigCatAllOf; +import org.openapitools.model.Cat; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * BigCat + */ +@JsonPropertyOrder({ + BigCat.JSON_PROPERTY_KIND +}) +@JsonTypeName("BigCat") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class BigCat extends Cat { + /** + * Gets or Sets kind + */ + public enum KindEnum { + LIONS("lions"), + TIGERS("tigers"), + LEOPARDS("leopards"), + JAGUARS("jaguars"); + + private String value; + + KindEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static KindEnum fromValue(String value) { + for (KindEnum b : KindEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_KIND = "kind"; + private KindEnum kind; + + public BigCat kind(KindEnum kind) { + this.kind = kind; + return this; + } + + /** + * Get kind + * @return kind + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_KIND) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public KindEnum getKind() { + return kind; + } + + @JsonProperty(JSON_PROPERTY_KIND) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setKind(KindEnum kind) { + this.kind = kind; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BigCat bigCat = (BigCat) o; + return Objects.equals(this.kind, bigCat.kind) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(kind, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class BigCat {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java new file mode 100644 index 00000000000..cdc464b8e9d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -0,0 +1,134 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * BigCatAllOf + */ +@JsonPropertyOrder({ + BigCatAllOf.JSON_PROPERTY_KIND +}) +@JsonTypeName("BigCat_allOf") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class BigCatAllOf { + /** + * Gets or Sets kind + */ + public enum KindEnum { + LIONS("lions"), + TIGERS("tigers"), + LEOPARDS("leopards"), + JAGUARS("jaguars"); + + private String value; + + KindEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static KindEnum fromValue(String value) { + for (KindEnum b : KindEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_KIND = "kind"; + private KindEnum kind; + + public BigCatAllOf kind(KindEnum kind) { + this.kind = kind; + return this; + } + + /** + * Get kind + * @return kind + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_KIND) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public KindEnum getKind() { + return kind; + } + + @JsonProperty(JSON_PROPERTY_KIND) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setKind(KindEnum kind) { + this.kind = kind; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BigCatAllOf bigCatAllOf = (BigCatAllOf) o; + return Objects.equals(this.kind, bigCatAllOf.kind); + } + + @Override + public int hashCode() { + return Objects.hash(kind); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class BigCatAllOf {\n"); + sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java new file mode 100644 index 00000000000..dd01342a8a6 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java @@ -0,0 +1,244 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Capitalization + */ +@JsonPropertyOrder({ + Capitalization.JSON_PROPERTY_SMALL_CAMEL, + Capitalization.JSON_PROPERTY_CAPITAL_CAMEL, + Capitalization.JSON_PROPERTY_SMALL_SNAKE, + Capitalization.JSON_PROPERTY_CAPITAL_SNAKE, + Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS, + Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E +}) +@JsonTypeName("Capitalization") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Capitalization { + public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel"; + private String smallCamel; + + public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel"; + private String capitalCamel; + + public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake"; + private String smallSnake; + + public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake"; + private String capitalSnake; + + public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points"; + private String scAETHFlowPoints; + + public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME"; + private String ATT_NAME; + + public Capitalization smallCamel(String smallCamel) { + this.smallCamel = smallCamel; + return this; + } + + /** + * Get smallCamel + * @return smallCamel + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SMALL_CAMEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getSmallCamel() { + return smallCamel; + } + + @JsonProperty(JSON_PROPERTY_SMALL_CAMEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setSmallCamel(String smallCamel) { + this.smallCamel = smallCamel; + } + + public Capitalization capitalCamel(String capitalCamel) { + this.capitalCamel = capitalCamel; + return this; + } + + /** + * Get capitalCamel + * @return capitalCamel + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCapitalCamel() { + return capitalCamel; + } + + @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCapitalCamel(String capitalCamel) { + this.capitalCamel = capitalCamel; + } + + public Capitalization smallSnake(String smallSnake) { + this.smallSnake = smallSnake; + return this; + } + + /** + * Get smallSnake + * @return smallSnake + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getSmallSnake() { + return smallSnake; + } + + @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setSmallSnake(String smallSnake) { + this.smallSnake = smallSnake; + } + + public Capitalization capitalSnake(String capitalSnake) { + this.capitalSnake = capitalSnake; + return this; + } + + /** + * Get capitalSnake + * @return capitalSnake + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCapitalSnake() { + return capitalSnake; + } + + @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCapitalSnake(String capitalSnake) { + this.capitalSnake = capitalSnake; + } + + public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { + this.scAETHFlowPoints = scAETHFlowPoints; + return this; + } + + /** + * Get scAETHFlowPoints + * @return scAETHFlowPoints + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getScAETHFlowPoints() { + return scAETHFlowPoints; + } + + @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setScAETHFlowPoints(String scAETHFlowPoints) { + this.scAETHFlowPoints = scAETHFlowPoints; + } + + public Capitalization ATT_NAME(String ATT_NAME) { + this.ATT_NAME = ATT_NAME; + return this; + } + + /** + * Name of the pet + * @return ATT_NAME + **/ + @Nullable + @ApiModelProperty(value = "Name of the pet ") + @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getATTNAME() { + return ATT_NAME; + } + + @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setATTNAME(String ATT_NAME) { + this.ATT_NAME = ATT_NAME; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Capitalization capitalization = (Capitalization) o; + return Objects.equals(this.smallCamel, capitalization.smallCamel) && + Objects.equals(this.capitalCamel, capitalization.capitalCamel) && + Objects.equals(this.smallSnake, capitalization.smallSnake) && + Objects.equals(this.capitalSnake, capitalization.capitalSnake) && + Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && + Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); + } + + @Override + public int hashCode() { + return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Capitalization {\n"); + sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); + sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); + sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); + sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); + sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); + sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java new file mode 100644 index 00000000000..8f9fe12d884 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.Animal; +import org.openapitools.model.CatAllOf; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Cat + */ +@JsonPropertyOrder({ + Cat.JSON_PROPERTY_DECLAWED +}) +@JsonTypeName("Cat") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Cat extends Animal { + public static final String JSON_PROPERTY_DECLAWED = "declawed"; + private Boolean declawed; + + public Cat declawed(Boolean declawed) { + this.declawed = declawed; + return this; + } + + /** + * Get declawed + * @return declawed + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DECLAWED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getDeclawed() { + return declawed; + } + + @JsonProperty(JSON_PROPERTY_DECLAWED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDeclawed(Boolean declawed) { + this.declawed = declawed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Cat cat = (Cat) o; + return Objects.equals(this.declawed, cat.declawed) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(declawed, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Cat {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java new file mode 100644 index 00000000000..4ee623d649b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java @@ -0,0 +1,99 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * CatAllOf + */ +@JsonPropertyOrder({ + CatAllOf.JSON_PROPERTY_DECLAWED +}) +@JsonTypeName("Cat_allOf") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class CatAllOf { + public static final String JSON_PROPERTY_DECLAWED = "declawed"; + private Boolean declawed; + + public CatAllOf declawed(Boolean declawed) { + this.declawed = declawed; + return this; + } + + /** + * Get declawed + * @return declawed + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DECLAWED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getDeclawed() { + return declawed; + } + + @JsonProperty(JSON_PROPERTY_DECLAWED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDeclawed(Boolean declawed) { + this.declawed = declawed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + CatAllOf catAllOf = (CatAllOf) o; + return Objects.equals(this.declawed, catAllOf.declawed); + } + + @Override + public int hashCode() { + return Objects.hash(declawed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class CatAllOf {\n"); + sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java new file mode 100644 index 00000000000..552c577d79a --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java @@ -0,0 +1,128 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Category + */ +@JsonPropertyOrder({ + Category.JSON_PROPERTY_ID, + Category.JSON_PROPERTY_NAME +}) +@JsonTypeName("Category") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Category { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + public static final String JSON_PROPERTY_NAME = "name"; + private String name = "default-name"; + + public Category id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + public Category name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Category category = (Category) o; + return Objects.equals(this.id, category.id) && + Objects.equals(this.name, category.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java new file mode 100644 index 00000000000..2f94229b7e8 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java @@ -0,0 +1,100 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Model for testing model with \"_class\" property + */ +@ApiModel(description = "Model for testing model with \"_class\" property") +@JsonPropertyOrder({ + ClassModel.JSON_PROPERTY_PROPERTY_CLASS +}) +@JsonTypeName("ClassModel") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ClassModel { + public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class"; + private String propertyClass; + + public ClassModel propertyClass(String propertyClass) { + this.propertyClass = propertyClass; + return this; + } + + /** + * Get propertyClass + * @return propertyClass + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPropertyClass() { + return propertyClass; + } + + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPropertyClass(String propertyClass) { + this.propertyClass = propertyClass; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ClassModel classModel = (ClassModel) o; + return Objects.equals(this.propertyClass, classModel.propertyClass); + } + + @Override + public int hashCode() { + return Objects.hash(propertyClass); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ClassModel {\n"); + sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java new file mode 100644 index 00000000000..8bde5e0809e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java @@ -0,0 +1,103 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.Animal; +import org.openapitools.model.DogAllOf; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Dog + */ +@JsonPropertyOrder({ + Dog.JSON_PROPERTY_BREED +}) +@JsonTypeName("Dog") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Dog extends Animal { + public static final String JSON_PROPERTY_BREED = "breed"; + private String breed; + + public Dog breed(String breed) { + this.breed = breed; + return this; + } + + /** + * Get breed + * @return breed + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BREED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBreed() { + return breed; + } + + @JsonProperty(JSON_PROPERTY_BREED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBreed(String breed) { + this.breed = breed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Dog dog = (Dog) o; + return Objects.equals(this.breed, dog.breed) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(breed, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Dog {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java new file mode 100644 index 00000000000..51dec00ea10 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java @@ -0,0 +1,99 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * DogAllOf + */ +@JsonPropertyOrder({ + DogAllOf.JSON_PROPERTY_BREED +}) +@JsonTypeName("Dog_allOf") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class DogAllOf { + public static final String JSON_PROPERTY_BREED = "breed"; + private String breed; + + public DogAllOf breed(String breed) { + this.breed = breed; + return this; + } + + /** + * Get breed + * @return breed + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BREED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBreed() { + return breed; + } + + @JsonProperty(JSON_PROPERTY_BREED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBreed(String breed) { + this.breed = breed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DogAllOf dogAllOf = (DogAllOf) o; + return Objects.equals(this.breed, dogAllOf.breed); + } + + @Override + public int hashCode() { + return Objects.hash(breed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class DogAllOf {\n"); + sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java new file mode 100644 index 00000000000..c71f5edf0c4 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java @@ -0,0 +1,204 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * EnumArrays + */ +@JsonPropertyOrder({ + EnumArrays.JSON_PROPERTY_JUST_SYMBOL, + EnumArrays.JSON_PROPERTY_ARRAY_ENUM +}) +@JsonTypeName("EnumArrays") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class EnumArrays { + /** + * Gets or Sets justSymbol + */ + public enum JustSymbolEnum { + GREATER_THAN_OR_EQUAL_TO(">="), + DOLLAR("$"); + + private String value; + + JustSymbolEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static JustSymbolEnum fromValue(String value) { + for (JustSymbolEnum b : JustSymbolEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol"; + private JustSymbolEnum justSymbol; + + /** + * Gets or Sets arrayEnum + */ + public enum ArrayEnumEnum { + FISH("fish"), + CRAB("crab"); + + private String value; + + ArrayEnumEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ArrayEnumEnum fromValue(String value) { + for (ArrayEnumEnum b : ArrayEnumEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; + private List arrayEnum = null; + + public EnumArrays justSymbol(JustSymbolEnum justSymbol) { + this.justSymbol = justSymbol; + return this; + } + + /** + * Get justSymbol + * @return justSymbol + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_JUST_SYMBOL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public JustSymbolEnum getJustSymbol() { + return justSymbol; + } + + @JsonProperty(JSON_PROPERTY_JUST_SYMBOL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setJustSymbol(JustSymbolEnum justSymbol) { + this.justSymbol = justSymbol; + } + + public EnumArrays arrayEnum(List arrayEnum) { + this.arrayEnum = arrayEnum; + return this; + } + + public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { + if (this.arrayEnum == null) { + this.arrayEnum = new ArrayList(); + } + this.arrayEnum.add(arrayEnumItem); + return this; + } + + /** + * Get arrayEnum + * @return arrayEnum + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getArrayEnum() { + return arrayEnum; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayEnum(List arrayEnum) { + this.arrayEnum = arrayEnum; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EnumArrays enumArrays = (EnumArrays) o; + return Objects.equals(this.justSymbol, enumArrays.justSymbol) && + Objects.equals(this.arrayEnum, enumArrays.arrayEnum); + } + + @Override + public int hashCode() { + return Objects.hash(justSymbol, arrayEnum); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class EnumArrays {\n"); + sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); + sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java new file mode 100644 index 00000000000..1ee1b126d03 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java @@ -0,0 +1,62 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets EnumClass + */ +@Introspected +public enum EnumClass { + _ABC("_abc"), + _EFG("-efg"), + _XYZ_("(xyz)"); + + private String value; + + EnumClass(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumClass fromValue(String value) { + for (EnumClass b : EnumClass.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java new file mode 100644 index 00000000000..0b9c758a822 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java @@ -0,0 +1,350 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.OuterEnum; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * EnumTest + */ +@JsonPropertyOrder({ + EnumTest.JSON_PROPERTY_ENUM_STRING, + EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED, + EnumTest.JSON_PROPERTY_ENUM_INTEGER, + EnumTest.JSON_PROPERTY_ENUM_NUMBER, + EnumTest.JSON_PROPERTY_OUTER_ENUM +}) +@JsonTypeName("Enum_Test") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class EnumTest { + /** + * Gets or Sets enumString + */ + public enum EnumStringEnum { + UPPER("UPPER"), + LOWER("lower"), + EMPTY(""); + + private String value; + + EnumStringEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumStringEnum fromValue(String value) { + for (EnumStringEnum b : EnumStringEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_ENUM_STRING = "enum_string"; + private EnumStringEnum enumString; + + /** + * Gets or Sets enumStringRequired + */ + public enum EnumStringRequiredEnum { + UPPER("UPPER"), + LOWER("lower"), + EMPTY(""); + + private String value; + + EnumStringRequiredEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumStringRequiredEnum fromValue(String value) { + for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required"; + private EnumStringRequiredEnum enumStringRequired; + + /** + * Gets or Sets enumInteger + */ + public enum EnumIntegerEnum { + NUMBER_1(1), + NUMBER_MINUS_1(-1); + + private Integer value; + + EnumIntegerEnum(Integer value) { + this.value = value; + } + + @JsonValue + public Integer getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumIntegerEnum fromValue(Integer value) { + for (EnumIntegerEnum b : EnumIntegerEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer"; + private EnumIntegerEnum enumInteger; + + /** + * Gets or Sets enumNumber + */ + public enum EnumNumberEnum { + NUMBER_1_DOT_1(1.1), + NUMBER_MINUS_1_DOT_2(-1.2); + + private Double value; + + EnumNumberEnum(Double value) { + this.value = value; + } + + @JsonValue + public Double getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumNumberEnum fromValue(Double value) { + for (EnumNumberEnum b : EnumNumberEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number"; + private EnumNumberEnum enumNumber; + + public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum"; + private OuterEnum outerEnum; + + public EnumTest enumString(EnumStringEnum enumString) { + this.enumString = enumString; + return this; + } + + /** + * Get enumString + * @return enumString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ENUM_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public EnumStringEnum getEnumString() { + return enumString; + } + + @JsonProperty(JSON_PROPERTY_ENUM_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEnumString(EnumStringEnum enumString) { + this.enumString = enumString; + } + + public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { + this.enumStringRequired = enumStringRequired; + return this; + } + + /** + * Get enumStringRequired + * @return enumStringRequired + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public EnumStringRequiredEnum getEnumStringRequired() { + return enumStringRequired; + } + + @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { + this.enumStringRequired = enumStringRequired; + } + + public EnumTest enumInteger(EnumIntegerEnum enumInteger) { + this.enumInteger = enumInteger; + return this; + } + + /** + * Get enumInteger + * @return enumInteger + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public EnumIntegerEnum getEnumInteger() { + return enumInteger; + } + + @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEnumInteger(EnumIntegerEnum enumInteger) { + this.enumInteger = enumInteger; + } + + public EnumTest enumNumber(EnumNumberEnum enumNumber) { + this.enumNumber = enumNumber; + return this; + } + + /** + * Get enumNumber + * @return enumNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public EnumNumberEnum getEnumNumber() { + return enumNumber; + } + + @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEnumNumber(EnumNumberEnum enumNumber) { + this.enumNumber = enumNumber; + } + + public EnumTest outerEnum(OuterEnum outerEnum) { + this.outerEnum = outerEnum; + return this; + } + + /** + * Get outerEnum + * @return outerEnum + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_OUTER_ENUM) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OuterEnum getOuterEnum() { + return outerEnum; + } + + @JsonProperty(JSON_PROPERTY_OUTER_ENUM) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOuterEnum(OuterEnum outerEnum) { + this.outerEnum = outerEnum; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EnumTest enumTest = (EnumTest) o; + return Objects.equals(this.enumString, enumTest.enumString) && + Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && + Objects.equals(this.enumInteger, enumTest.enumInteger) && + Objects.equals(this.enumNumber, enumTest.enumNumber) && + Objects.equals(this.outerEnum, enumTest.outerEnum); + } + + @Override + public int hashCode() { + return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class EnumTest {\n"); + sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); + sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n"); + sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); + sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); + sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java new file mode 100644 index 00000000000..083b6db28cf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -0,0 +1,139 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * FileSchemaTestClass + */ +@JsonPropertyOrder({ + FileSchemaTestClass.JSON_PROPERTY_FILE, + FileSchemaTestClass.JSON_PROPERTY_FILES +}) +@JsonTypeName("FileSchemaTestClass") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class FileSchemaTestClass { + public static final String JSON_PROPERTY_FILE = "file"; + private java.io.File file; + + public static final String JSON_PROPERTY_FILES = "files"; + private List files = null; + + public FileSchemaTestClass file(java.io.File file) { + this.file = file; + return this; + } + + /** + * Get file + * @return file + **/ + @Valid + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_FILE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public java.io.File getFile() { + return file; + } + + @JsonProperty(JSON_PROPERTY_FILE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFile(java.io.File file) { + this.file = file; + } + + public FileSchemaTestClass files(List files) { + this.files = files; + return this; + } + + public FileSchemaTestClass addFilesItem(java.io.File filesItem) { + if (this.files == null) { + this.files = new ArrayList(); + } + this.files.add(filesItem); + return this; + } + + /** + * Get files + * @return files + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_FILES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getFiles() { + return files; + } + + @JsonProperty(JSON_PROPERTY_FILES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFiles(List files) { + this.files = files; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; + return Objects.equals(this.file, fileSchemaTestClass.file) && + Objects.equals(this.files, fileSchemaTestClass.files); + } + + @Override + public int hashCode() { + return Objects.hash(file, files); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FileSchemaTestClass {\n"); + sb.append(" file: ").append(toIndentedString(file)).append("\n"); + sb.append(" files: ").append(toIndentedString(files)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java new file mode 100644 index 00000000000..239ef22ecb2 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java @@ -0,0 +1,507 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.File; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.UUID; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * FormatTest + */ +@JsonPropertyOrder({ + FormatTest.JSON_PROPERTY_INTEGER, + FormatTest.JSON_PROPERTY_INT32, + FormatTest.JSON_PROPERTY_INT64, + FormatTest.JSON_PROPERTY_NUMBER, + FormatTest.JSON_PROPERTY_FLOAT, + FormatTest.JSON_PROPERTY_DOUBLE, + FormatTest.JSON_PROPERTY_STRING, + FormatTest.JSON_PROPERTY_BYTE, + FormatTest.JSON_PROPERTY_BINARY, + FormatTest.JSON_PROPERTY_DATE, + FormatTest.JSON_PROPERTY_DATE_TIME, + FormatTest.JSON_PROPERTY_UUID, + FormatTest.JSON_PROPERTY_PASSWORD, + FormatTest.JSON_PROPERTY_BIG_DECIMAL +}) +@JsonTypeName("format_test") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class FormatTest { + public static final String JSON_PROPERTY_INTEGER = "integer"; + private Integer integer; + + public static final String JSON_PROPERTY_INT32 = "int32"; + private Integer int32; + + public static final String JSON_PROPERTY_INT64 = "int64"; + private Long int64; + + public static final String JSON_PROPERTY_NUMBER = "number"; + private BigDecimal number; + + public static final String JSON_PROPERTY_FLOAT = "float"; + private Float _float; + + public static final String JSON_PROPERTY_DOUBLE = "double"; + private Double _double; + + public static final String JSON_PROPERTY_STRING = "string"; + private String string; + + public static final String JSON_PROPERTY_BYTE = "byte"; + private byte[] _byte; + + public static final String JSON_PROPERTY_BINARY = "binary"; + private File binary; + + public static final String JSON_PROPERTY_DATE = "date"; + private LocalDate date; + + public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + private LocalDateTime dateTime; + + public static final String JSON_PROPERTY_UUID = "uuid"; + private UUID uuid; + + public static final String JSON_PROPERTY_PASSWORD = "password"; + private String password; + + public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; + private BigDecimal bigDecimal; + + public FormatTest integer(Integer integer) { + this.integer = integer; + return this; + } + + /** + * Get integer + * minimum: 10 + * maximum: 100 + * @return integer + **/ + @Nullable + @Min(10) + @Max(100) + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getInteger() { + return integer; + } + + @JsonProperty(JSON_PROPERTY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setInteger(Integer integer) { + this.integer = integer; + } + + public FormatTest int32(Integer int32) { + this.int32 = int32; + return this; + } + + /** + * Get int32 + * minimum: 20 + * maximum: 200 + * @return int32 + **/ + @Nullable + @Min(20) + @Max(200) + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_INT32) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getInt32() { + return int32; + } + + @JsonProperty(JSON_PROPERTY_INT32) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setInt32(Integer int32) { + this.int32 = int32; + } + + public FormatTest int64(Long int64) { + this.int64 = int64; + return this; + } + + /** + * Get int64 + * @return int64 + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_INT64) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getInt64() { + return int64; + } + + @JsonProperty(JSON_PROPERTY_INT64) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setInt64(Long int64) { + this.int64 = int64; + } + + public FormatTest number(BigDecimal number) { + this.number = number; + return this; + } + + /** + * Get number + * minimum: 32.1 + * maximum: 543.2 + * @return number + **/ + @NotNull + @DecimalMin("32.1") + @DecimalMax("543.2") + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public BigDecimal getNumber() { + return number; + } + + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setNumber(BigDecimal number) { + this.number = number; + } + + public FormatTest _float(Float _float) { + this._float = _float; + return this; + } + + /** + * Get _float + * minimum: 54.3 + * maximum: 987.6 + * @return _float + **/ + @Nullable + @DecimalMin("54.3") + @DecimalMax("987.6") + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Float getFloat() { + return _float; + } + + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFloat(Float _float) { + this._float = _float; + } + + public FormatTest _double(Double _double) { + this._double = _double; + return this; + } + + /** + * Get _double + * minimum: 67.8 + * maximum: 123.4 + * @return _double + **/ + @Nullable + @DecimalMin("67.8") + @DecimalMax("123.4") + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Double getDouble() { + return _double; + } + + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDouble(Double _double) { + this._double = _double; + } + + public FormatTest string(String string) { + this.string = string; + return this; + } + + /** + * Get string + * @return string + **/ + @Nullable + @Pattern(regexp="/[a-z]/i") + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getString() { + return string; + } + + @JsonProperty(JSON_PROPERTY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setString(String string) { + this.string = string; + } + + public FormatTest _byte(byte[] _byte) { + this._byte = _byte; + return this; + } + + /** + * Get _byte + * @return _byte + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_BYTE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public byte[] getByte() { + return _byte; + } + + @JsonProperty(JSON_PROPERTY_BYTE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setByte(byte[] _byte) { + this._byte = _byte; + } + + public FormatTest binary(File binary) { + this.binary = binary; + return this; + } + + /** + * Get binary + * @return binary + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BINARY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public File getBinary() { + return binary; + } + + @JsonProperty(JSON_PROPERTY_BINARY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBinary(File binary) { + this.binary = binary; + } + + public FormatTest date(LocalDate date) { + this.date = date; + return this; + } + + /** + * Get date + * @return date + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_DATE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + public LocalDate getDate() { + return date; + } + + @JsonProperty(JSON_PROPERTY_DATE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + public void setDate(LocalDate date) { + this.date = date; + } + + public FormatTest dateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public LocalDateTime getDateTime() { + return dateTime; + } + + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public void setDateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + } + + public FormatTest uuid(UUID uuid) { + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + **/ + @Nullable + @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public UUID getUuid() { + return uuid; + } + + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUuid(UUID uuid) { + this.uuid = uuid; + } + + public FormatTest password(String password) { + this.password = password; + return this; + } + + /** + * Get password + * @return password + **/ + @NotNull + @Size(min=10, max=64) + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_PASSWORD) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getPassword() { + return password; + } + + @JsonProperty(JSON_PROPERTY_PASSWORD) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setPassword(String password) { + this.password = password; + } + + public FormatTest bigDecimal(BigDecimal bigDecimal) { + this.bigDecimal = bigDecimal; + return this; + } + + /** + * Get bigDecimal + * @return bigDecimal + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getBigDecimal() { + return bigDecimal; + } + + @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBigDecimal(BigDecimal bigDecimal) { + this.bigDecimal = bigDecimal; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FormatTest formatTest = (FormatTest) o; + return Objects.equals(this.integer, formatTest.integer) && + Objects.equals(this.int32, formatTest.int32) && + Objects.equals(this.int64, formatTest.int64) && + Objects.equals(this.number, formatTest.number) && + Objects.equals(this._float, formatTest._float) && + Objects.equals(this._double, formatTest._double) && + Objects.equals(this.string, formatTest.string) && + Arrays.equals(this._byte, formatTest._byte) && + Objects.equals(this.binary, formatTest.binary) && + Objects.equals(this.date, formatTest.date) && + Objects.equals(this.dateTime, formatTest.dateTime) && + Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this.password, formatTest.password) && + Objects.equals(this.bigDecimal, formatTest.bigDecimal); + } + + @Override + public int hashCode() { + return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FormatTest {\n"); + sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); + sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); + sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); + sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); + sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" date: ").append(toIndentedString(date)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java new file mode 100644 index 00000000000..43e713b0305 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -0,0 +1,106 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * HasOnlyReadOnly + */ +@JsonPropertyOrder({ + HasOnlyReadOnly.JSON_PROPERTY_BAR, + HasOnlyReadOnly.JSON_PROPERTY_FOO +}) +@JsonTypeName("hasOnlyReadOnly") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class HasOnlyReadOnly { + public static final String JSON_PROPERTY_BAR = "bar"; + private String bar; + + public static final String JSON_PROPERTY_FOO = "foo"; + private String foo; + + /** + * Get bar + * @return bar + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BAR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBar() { + return bar; + } + + /** + * Get foo + * @return foo + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_FOO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getFoo() { + return foo; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; + return Objects.equals(this.bar, hasOnlyReadOnly.bar) && + Objects.equals(this.foo, hasOnlyReadOnly.foo); + } + + @Override + public int hashCode() { + return Objects.hash(bar, foo); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class HasOnlyReadOnly {\n"); + sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); + sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java new file mode 100644 index 00000000000..259929412b2 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java @@ -0,0 +1,254 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * MapTest + */ +@JsonPropertyOrder({ + MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING, + MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING, + MapTest.JSON_PROPERTY_DIRECT_MAP, + MapTest.JSON_PROPERTY_INDIRECT_MAP +}) +@JsonTypeName("MapTest") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class MapTest { + public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; + private Map> mapMapOfString = null; + + /** + * Gets or Sets inner + */ + public enum InnerEnum { + UPPER("UPPER"), + LOWER("lower"); + + private String value; + + InnerEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static InnerEnum fromValue(String value) { + for (InnerEnum b : InnerEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; + private Map mapOfEnumString = null; + + public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; + private Map directMap = null; + + public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; + private Map indirectMap = null; + + public MapTest mapMapOfString(Map> mapMapOfString) { + this.mapMapOfString = mapMapOfString; + return this; + } + + public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { + if (this.mapMapOfString == null) { + this.mapMapOfString = new HashMap>(); + } + this.mapMapOfString.put(key, mapMapOfStringItem); + return this; + } + + /** + * Get mapMapOfString + * @return mapMapOfString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map> getMapMapOfString() { + return mapMapOfString; + } + + @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapOfString(Map> mapMapOfString) { + this.mapMapOfString = mapMapOfString; + } + + public MapTest mapOfEnumString(Map mapOfEnumString) { + this.mapOfEnumString = mapOfEnumString; + return this; + } + + public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { + if (this.mapOfEnumString == null) { + this.mapOfEnumString = new HashMap(); + } + this.mapOfEnumString.put(key, mapOfEnumStringItem); + return this; + } + + /** + * Get mapOfEnumString + * @return mapOfEnumString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMapOfEnumString() { + return mapOfEnumString; + } + + @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapOfEnumString(Map mapOfEnumString) { + this.mapOfEnumString = mapOfEnumString; + } + + public MapTest directMap(Map directMap) { + this.directMap = directMap; + return this; + } + + public MapTest putDirectMapItem(String key, Boolean directMapItem) { + if (this.directMap == null) { + this.directMap = new HashMap(); + } + this.directMap.put(key, directMapItem); + return this; + } + + /** + * Get directMap + * @return directMap + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DIRECT_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getDirectMap() { + return directMap; + } + + @JsonProperty(JSON_PROPERTY_DIRECT_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDirectMap(Map directMap) { + this.directMap = directMap; + } + + public MapTest indirectMap(Map indirectMap) { + this.indirectMap = indirectMap; + return this; + } + + public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { + if (this.indirectMap == null) { + this.indirectMap = new HashMap(); + } + this.indirectMap.put(key, indirectMapItem); + return this; + } + + /** + * Get indirectMap + * @return indirectMap + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getIndirectMap() { + return indirectMap; + } + + @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIndirectMap(Map indirectMap) { + this.indirectMap = indirectMap; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MapTest mapTest = (MapTest) o; + return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && + Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && + Objects.equals(this.directMap, mapTest.directMap) && + Objects.equals(this.indirectMap, mapTest.indirectMap); + } + + @Override + public int hashCode() { + return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MapTest {\n"); + sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); + sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); + sb.append(" directMap: ").append(toIndentedString(directMap)).append("\n"); + sb.append(" indirectMap: ").append(toIndentedString(indirectMap)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java new file mode 100644 index 00000000000..4f546fae5f9 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -0,0 +1,173 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.openapitools.model.Animal; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * MixedPropertiesAndAdditionalPropertiesClass + */ +@JsonPropertyOrder({ + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP +}) +@JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class MixedPropertiesAndAdditionalPropertiesClass { + public static final String JSON_PROPERTY_UUID = "uuid"; + private UUID uuid; + + public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + private LocalDateTime dateTime; + + public static final String JSON_PROPERTY_MAP = "map"; + private Map map = null; + + public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public UUID getUuid() { + return uuid; + } + + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUuid(UUID uuid) { + this.uuid = uuid; + } + + public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public LocalDateTime getDateTime() { + return dateTime; + } + + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public void setDateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + } + + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + this.map = map; + return this; + } + + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap(); + } + this.map.put(key, mapItem); + return this; + } + + /** + * Get map + * @return map + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getMap() { + return map; + } + + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMap(Map map) { + this.map = map; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; + return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && + Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && + Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, dateTime, map); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java new file mode 100644 index 00000000000..34604b7b3bf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java @@ -0,0 +1,129 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Model for testing model name starting with number + */ +@ApiModel(description = "Model for testing model name starting with number") +@JsonPropertyOrder({ + Model200Response.JSON_PROPERTY_NAME, + Model200Response.JSON_PROPERTY_PROPERTY_CLASS +}) +@JsonTypeName("200_response") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Model200Response { + public static final String JSON_PROPERTY_NAME = "name"; + private Integer name; + + public static final String JSON_PROPERTY_PROPERTY_CLASS = "class"; + private String propertyClass; + + public Model200Response name(Integer name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(Integer name) { + this.name = name; + } + + public Model200Response propertyClass(String propertyClass) { + this.propertyClass = propertyClass; + return this; + } + + /** + * Get propertyClass + * @return propertyClass + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPropertyClass() { + return propertyClass; + } + + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPropertyClass(String propertyClass) { + this.propertyClass = propertyClass; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Model200Response _200response = (Model200Response) o; + return Objects.equals(this.name, _200response.name) && + Objects.equals(this.propertyClass, _200response.propertyClass); + } + + @Override + public int hashCode() { + return Objects.hash(name, propertyClass); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Model200Response {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java new file mode 100644 index 00000000000..7d185d9d0ba --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -0,0 +1,157 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ModelApiResponse + */ +@JsonPropertyOrder({ + ModelApiResponse.JSON_PROPERTY_CODE, + ModelApiResponse.JSON_PROPERTY_TYPE, + ModelApiResponse.JSON_PROPERTY_MESSAGE +}) +@JsonTypeName("ApiResponse") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ModelApiResponse { + public static final String JSON_PROPERTY_CODE = "code"; + private Integer code; + + public static final String JSON_PROPERTY_TYPE = "type"; + private String type; + + public static final String JSON_PROPERTY_MESSAGE = "message"; + private String message; + + public ModelApiResponse code(Integer code) { + this.code = code; + return this; + } + + /** + * Get code + * @return code + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_CODE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getCode() { + return code; + } + + @JsonProperty(JSON_PROPERTY_CODE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCode(Integer code) { + this.code = code; + } + + public ModelApiResponse type(String type) { + this.type = type; + return this; + } + + /** + * Get type + * @return type + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getType() { + return type; + } + + @JsonProperty(JSON_PROPERTY_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setType(String type) { + this.type = type; + } + + public ModelApiResponse message(String message) { + this.message = message; + return this; + } + + /** + * Get message + * @return message + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getMessage() { + return message; + } + + @JsonProperty(JSON_PROPERTY_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMessage(String message) { + this.message = message; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelApiResponse _apiResponse = (ModelApiResponse) o; + return Objects.equals(this.code, _apiResponse.code) && + Objects.equals(this.type, _apiResponse.type) && + Objects.equals(this.message, _apiResponse.message); + } + + @Override + public int hashCode() { + return Objects.hash(code, type, message); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelApiResponse {\n"); + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java new file mode 100644 index 00000000000..af4f73af5cc --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java @@ -0,0 +1,99 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ModelClient + */ +@JsonPropertyOrder({ + ModelClient.JSON_PROPERTY_CLIENT +}) +@JsonTypeName("Client") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ModelClient { + public static final String JSON_PROPERTY_CLIENT = "client"; + private String _client; + + public ModelClient _client(String _client) { + this._client = _client; + return this; + } + + /** + * Get _client + * @return _client + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_CLIENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getClient() { + return _client; + } + + @JsonProperty(JSON_PROPERTY_CLIENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setClient(String _client) { + this._client = _client; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelClient _client = (ModelClient) o; + return Objects.equals(this._client, _client._client); + } + + @Override + public int hashCode() { + return Objects.hash(_client); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelClient {\n"); + sb.append(" _client: ").append(toIndentedString(_client)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java new file mode 100644 index 00000000000..2688ecad262 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java @@ -0,0 +1,100 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Model for testing reserved words + */ +@ApiModel(description = "Model for testing reserved words") +@JsonPropertyOrder({ + ModelReturn.JSON_PROPERTY_RETURN +}) +@JsonTypeName("Return") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ModelReturn { + public static final String JSON_PROPERTY_RETURN = "return"; + private Integer _return; + + public ModelReturn _return(Integer _return) { + this._return = _return; + return this; + } + + /** + * Get _return + * @return _return + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_RETURN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getReturn() { + return _return; + } + + @JsonProperty(JSON_PROPERTY_RETURN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setReturn(Integer _return) { + this._return = _return; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelReturn _return = (ModelReturn) o; + return Objects.equals(this._return, _return._return); + } + + @Override + public int hashCode() { + return Objects.hash(_return); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelReturn {\n"); + sb.append(" _return: ").append(toIndentedString(_return)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java new file mode 100644 index 00000000000..018d3cf558e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java @@ -0,0 +1,165 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Model for testing model name same as property name + */ +@ApiModel(description = "Model for testing model name same as property name") +@JsonPropertyOrder({ + Name.JSON_PROPERTY_NAME, + Name.JSON_PROPERTY_SNAKE_CASE, + Name.JSON_PROPERTY_PROPERTY, + Name.JSON_PROPERTY_123NUMBER +}) +@JsonTypeName("Name") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Name { + public static final String JSON_PROPERTY_NAME = "name"; + private Integer name; + + public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case"; + private Integer snakeCase; + + public static final String JSON_PROPERTY_PROPERTY = "property"; + private String property; + + public static final String JSON_PROPERTY_123NUMBER = "123Number"; + private Integer _123number; + + public Name name(Integer name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Integer getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setName(Integer name) { + this.name = name; + } + + /** + * Get snakeCase + * @return snakeCase + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SNAKE_CASE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getSnakeCase() { + return snakeCase; + } + + public Name property(String property) { + this.property = property; + return this; + } + + /** + * Get property + * @return property + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PROPERTY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getProperty() { + return property; + } + + @JsonProperty(JSON_PROPERTY_PROPERTY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setProperty(String property) { + this.property = property; + } + + /** + * Get _123number + * @return _123number + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_123NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer get123number() { + return _123number; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Name name = (Name) o; + return Objects.equals(this.name, name.name) && + Objects.equals(this.snakeCase, name.snakeCase) && + Objects.equals(this.property, name.property) && + Objects.equals(this._123number, name._123number); + } + + @Override + public int hashCode() { + return Objects.hash(name, snakeCase, property, _123number); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Name {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); + sb.append(" property: ").append(toIndentedString(property)).append("\n"); + sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java new file mode 100644 index 00000000000..e4197f390e5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java @@ -0,0 +1,100 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * NumberOnly + */ +@JsonPropertyOrder({ + NumberOnly.JSON_PROPERTY_JUST_NUMBER +}) +@JsonTypeName("NumberOnly") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class NumberOnly { + public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber"; + private BigDecimal justNumber; + + public NumberOnly justNumber(BigDecimal justNumber) { + this.justNumber = justNumber; + return this; + } + + /** + * Get justNumber + * @return justNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_JUST_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getJustNumber() { + return justNumber; + } + + @JsonProperty(JSON_PROPERTY_JUST_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setJustNumber(BigDecimal justNumber) { + this.justNumber = justNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NumberOnly numberOnly = (NumberOnly) o; + return Objects.equals(this.justNumber, numberOnly.justNumber); + } + + @Override + public int hashCode() { + return Objects.hash(justNumber); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class NumberOnly {\n"); + sb.append(" justNumber: ").append(toIndentedString(justNumber)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java new file mode 100644 index 00000000000..8ecdbda1260 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java @@ -0,0 +1,281 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Order + */ +@JsonPropertyOrder({ + Order.JSON_PROPERTY_ID, + Order.JSON_PROPERTY_PET_ID, + Order.JSON_PROPERTY_QUANTITY, + Order.JSON_PROPERTY_SHIP_DATE, + Order.JSON_PROPERTY_STATUS, + Order.JSON_PROPERTY_COMPLETE +}) +@JsonTypeName("Order") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Order { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + public static final String JSON_PROPERTY_PET_ID = "petId"; + private Long petId; + + public static final String JSON_PROPERTY_QUANTITY = "quantity"; + private Integer quantity; + + public static final String JSON_PROPERTY_SHIP_DATE = "shipDate"; + private LocalDateTime shipDate; + + /** + * Order Status + */ + public enum StatusEnum { + PLACED("placed"), + APPROVED("approved"), + DELIVERED("delivered"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_STATUS = "status"; + private StatusEnum status; + + public static final String JSON_PROPERTY_COMPLETE = "complete"; + private Boolean complete = false; + + public Order id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + public Order petId(Long petId) { + this.petId = petId; + return this; + } + + /** + * Get petId + * @return petId + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PET_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getPetId() { + return petId; + } + + @JsonProperty(JSON_PROPERTY_PET_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPetId(Long petId) { + this.petId = petId; + } + + public Order quantity(Integer quantity) { + this.quantity = quantity; + return this; + } + + /** + * Get quantity + * @return quantity + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_QUANTITY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getQuantity() { + return quantity; + } + + @JsonProperty(JSON_PROPERTY_QUANTITY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + public Order shipDate(LocalDateTime shipDate) { + this.shipDate = shipDate; + return this; + } + + /** + * Get shipDate + * @return shipDate + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SHIP_DATE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public LocalDateTime getShipDate() { + return shipDate; + } + + @JsonProperty(JSON_PROPERTY_SHIP_DATE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") + public void setShipDate(LocalDateTime shipDate) { + this.shipDate = shipDate; + } + + public Order status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * Order Status + * @return status + **/ + @Nullable + @ApiModelProperty(value = "Order Status") + @JsonProperty(JSON_PROPERTY_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public StatusEnum getStatus() { + return status; + } + + @JsonProperty(JSON_PROPERTY_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setStatus(StatusEnum status) { + this.status = status; + } + + public Order complete(Boolean complete) { + this.complete = complete; + return this; + } + + /** + * Get complete + * @return complete + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_COMPLETE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getComplete() { + return complete; + } + + @JsonProperty(JSON_PROPERTY_COMPLETE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setComplete(Boolean complete) { + this.complete = complete; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Order order = (Order) o; + return Objects.equals(this.id, order.id) && + Objects.equals(this.petId, order.petId) && + Objects.equals(this.quantity, order.quantity) && + Objects.equals(this.shipDate, order.shipDate) && + Objects.equals(this.status, order.status) && + Objects.equals(this.complete, order.complete); + } + + @Override + public int hashCode() { + return Objects.hash(id, petId, quantity, shipDate, status, complete); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java new file mode 100644 index 00000000000..4c41ddc658f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java @@ -0,0 +1,158 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * OuterComposite + */ +@JsonPropertyOrder({ + OuterComposite.JSON_PROPERTY_MY_NUMBER, + OuterComposite.JSON_PROPERTY_MY_STRING, + OuterComposite.JSON_PROPERTY_MY_BOOLEAN +}) +@JsonTypeName("OuterComposite") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class OuterComposite { + public static final String JSON_PROPERTY_MY_NUMBER = "my_number"; + private BigDecimal myNumber; + + public static final String JSON_PROPERTY_MY_STRING = "my_string"; + private String myString; + + public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean"; + private Boolean myBoolean; + + public OuterComposite myNumber(BigDecimal myNumber) { + this.myNumber = myNumber; + return this; + } + + /** + * Get myNumber + * @return myNumber + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getMyNumber() { + return myNumber; + } + + @JsonProperty(JSON_PROPERTY_MY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMyNumber(BigDecimal myNumber) { + this.myNumber = myNumber; + } + + public OuterComposite myString(String myString) { + this.myString = myString; + return this; + } + + /** + * Get myString + * @return myString + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getMyString() { + return myString; + } + + @JsonProperty(JSON_PROPERTY_MY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMyString(String myString) { + this.myString = myString; + } + + public OuterComposite myBoolean(Boolean myBoolean) { + this.myBoolean = myBoolean; + return this; + } + + /** + * Get myBoolean + * @return myBoolean + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getMyBoolean() { + return myBoolean; + } + + @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMyBoolean(Boolean myBoolean) { + this.myBoolean = myBoolean; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OuterComposite outerComposite = (OuterComposite) o; + return Objects.equals(this.myNumber, outerComposite.myNumber) && + Objects.equals(this.myString, outerComposite.myString) && + Objects.equals(this.myBoolean, outerComposite.myBoolean); + } + + @Override + public int hashCode() { + return Objects.hash(myNumber, myString, myBoolean); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OuterComposite {\n"); + sb.append(" myNumber: ").append(toIndentedString(myNumber)).append("\n"); + sb.append(" myString: ").append(toIndentedString(myString)).append("\n"); + sb.append(" myBoolean: ").append(toIndentedString(myBoolean)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java new file mode 100644 index 00000000000..76fe37007e9 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java @@ -0,0 +1,62 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets OuterEnum + */ +@Introspected +public enum OuterEnum { + PLACED("placed"), + APPROVED("approved"), + DELIVERED("delivered"); + + private String value; + + OuterEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OuterEnum fromValue(String value) { + for (OuterEnum b : OuterEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java new file mode 100644 index 00000000000..70fffbf6574 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java @@ -0,0 +1,298 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import org.openapitools.model.Category; +import org.openapitools.model.Tag; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Pet + */ +@JsonPropertyOrder({ + Pet.JSON_PROPERTY_ID, + Pet.JSON_PROPERTY_CATEGORY, + Pet.JSON_PROPERTY_NAME, + Pet.JSON_PROPERTY_PHOTO_URLS, + Pet.JSON_PROPERTY_TAGS, + Pet.JSON_PROPERTY_STATUS +}) +@JsonTypeName("Pet") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Pet { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + public static final String JSON_PROPERTY_CATEGORY = "category"; + private Category category; + + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; + private Set photoUrls = new LinkedHashSet(); + + public static final String JSON_PROPERTY_TAGS = "tags"; + private List tags = null; + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + PENDING("pending"), + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_STATUS = "status"; + private StatusEnum status; + + public Pet id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + public Pet category(Category category) { + this.category = category; + return this; + } + + /** + * Get category + * @return category + **/ + @Valid + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_CATEGORY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Category getCategory() { + return category; + } + + @JsonProperty(JSON_PROPERTY_CATEGORY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCategory(Category category) { + this.category = category; + } + + public Pet name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @NotNull + @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setName(String name) { + this.name = name; + } + + public Pet photoUrls(Set photoUrls) { + this.photoUrls = photoUrls; + return this; + } + + public Pet addPhotoUrlsItem(String photoUrlsItem) { + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_PHOTO_URLS) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Set getPhotoUrls() { + return photoUrls; + } + + @JsonProperty(JSON_PROPERTY_PHOTO_URLS) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setPhotoUrls(Set photoUrls) { + this.photoUrls = photoUrls; + } + + public Pet tags(List tags) { + this.tags = tags; + return this; + } + + public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList(); + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_TAGS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getTags() { + return tags; + } + + @JsonProperty(JSON_PROPERTY_TAGS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTags(List tags) { + this.tags = tags; + } + + public Pet status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + **/ + @Nullable + @ApiModelProperty(value = "pet status in the store") + @JsonProperty(JSON_PROPERTY_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public StatusEnum getStatus() { + return status; + } + + @JsonProperty(JSON_PROPERTY_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setStatus(StatusEnum status) { + this.status = status; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(this.id, pet.id) && + Objects.equals(this.category, pet.category) && + Objects.equals(this.name, pet.name) && + Objects.equals(this.photoUrls, pet.photoUrls) && + Objects.equals(this.tags, pet.tags) && + Objects.equals(this.status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java new file mode 100644 index 00000000000..a9827ceca00 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * ReadOnlyFirst + */ +@JsonPropertyOrder({ + ReadOnlyFirst.JSON_PROPERTY_BAR, + ReadOnlyFirst.JSON_PROPERTY_BAZ +}) +@JsonTypeName("ReadOnlyFirst") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class ReadOnlyFirst { + public static final String JSON_PROPERTY_BAR = "bar"; + private String bar; + + public static final String JSON_PROPERTY_BAZ = "baz"; + private String baz; + + /** + * Get bar + * @return bar + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BAR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBar() { + return bar; + } + + public ReadOnlyFirst baz(String baz) { + this.baz = baz; + return this; + } + + /** + * Get baz + * @return baz + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_BAZ) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBaz() { + return baz; + } + + @JsonProperty(JSON_PROPERTY_BAZ) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBaz(String baz) { + this.baz = baz; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; + return Objects.equals(this.bar, readOnlyFirst.bar) && + Objects.equals(this.baz, readOnlyFirst.baz); + } + + @Override + public int hashCode() { + return Objects.hash(bar, baz); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ReadOnlyFirst {\n"); + sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); + sb.append(" baz: ").append(toIndentedString(baz)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java new file mode 100644 index 00000000000..0845ebff638 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java @@ -0,0 +1,99 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * SpecialModelName + */ +@JsonPropertyOrder({ + SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME +}) +@JsonTypeName("$special[model.name]") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class SpecialModelName { + public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]"; + private Long $specialPropertyName; + + public SpecialModelName $specialPropertyName(Long $specialPropertyName) { + this.$specialPropertyName = $specialPropertyName; + return this; + } + + /** + * Get $specialPropertyName + * @return $specialPropertyName + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long get$SpecialPropertyName() { + return $specialPropertyName; + } + + @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void set$SpecialPropertyName(Long $specialPropertyName) { + this.$specialPropertyName = $specialPropertyName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SpecialModelName $specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + } + + @Override + public int hashCode() { + return Objects.hash($specialPropertyName); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class SpecialModelName {\n"); + sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java new file mode 100644 index 00000000000..eee95fd360d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java @@ -0,0 +1,128 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * Tag + */ +@JsonPropertyOrder({ + Tag.JSON_PROPERTY_ID, + Tag.JSON_PROPERTY_NAME +}) +@JsonTypeName("Tag") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class Tag { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public Tag id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + public Tag name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Tag tag = (Tag) o; + return Objects.equals(this.id, tag.id) && + Objects.equals(this.name, tag.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java new file mode 100644 index 00000000000..7475ae2ec45 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -0,0 +1,223 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * TypeHolderDefault + */ +@JsonPropertyOrder({ + TypeHolderDefault.JSON_PROPERTY_STRING_ITEM, + TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM, + TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM, + TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM, + TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM +}) +@JsonTypeName("TypeHolderDefault") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class TypeHolderDefault { + public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; + private String stringItem = "what"; + + public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item"; + private BigDecimal numberItem; + + public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item"; + private Integer integerItem; + + public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item"; + private Boolean boolItem = true; + + public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; + private List arrayItem = new ArrayList(); + + public TypeHolderDefault stringItem(String stringItem) { + this.stringItem = stringItem; + return this; + } + + /** + * Get stringItem + * @return stringItem + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_STRING_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getStringItem() { + return stringItem; + } + + @JsonProperty(JSON_PROPERTY_STRING_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setStringItem(String stringItem) { + this.stringItem = stringItem; + } + + public TypeHolderDefault numberItem(BigDecimal numberItem) { + this.numberItem = numberItem; + return this; + } + + /** + * Get numberItem + * @return numberItem + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_NUMBER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public BigDecimal getNumberItem() { + return numberItem; + } + + @JsonProperty(JSON_PROPERTY_NUMBER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setNumberItem(BigDecimal numberItem) { + this.numberItem = numberItem; + } + + public TypeHolderDefault integerItem(Integer integerItem) { + this.integerItem = integerItem; + return this; + } + + /** + * Get integerItem + * @return integerItem + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Integer getIntegerItem() { + return integerItem; + } + + @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setIntegerItem(Integer integerItem) { + this.integerItem = integerItem; + } + + public TypeHolderDefault boolItem(Boolean boolItem) { + this.boolItem = boolItem; + return this; + } + + /** + * Get boolItem + * @return boolItem + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_BOOL_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Boolean getBoolItem() { + return boolItem; + } + + @JsonProperty(JSON_PROPERTY_BOOL_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setBoolItem(Boolean boolItem) { + this.boolItem = boolItem; + } + + public TypeHolderDefault arrayItem(List arrayItem) { + this.arrayItem = arrayItem; + return this; + } + + public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + this.arrayItem.add(arrayItemItem); + return this; + } + + /** + * Get arrayItem + * @return arrayItem + **/ + @NotNull + @ApiModelProperty(required = true, value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public List getArrayItem() { + return arrayItem; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setArrayItem(List arrayItem) { + this.arrayItem = arrayItem; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o; + return Objects.equals(this.stringItem, typeHolderDefault.stringItem) && + Objects.equals(this.numberItem, typeHolderDefault.numberItem) && + Objects.equals(this.integerItem, typeHolderDefault.integerItem) && + Objects.equals(this.boolItem, typeHolderDefault.boolItem) && + Objects.equals(this.arrayItem, typeHolderDefault.arrayItem); + } + + @Override + public int hashCode() { + return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class TypeHolderDefault {\n"); + sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); + sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); + sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); + sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); + sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java new file mode 100644 index 00000000000..539ef489b97 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -0,0 +1,252 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * TypeHolderExample + */ +@JsonPropertyOrder({ + TypeHolderExample.JSON_PROPERTY_STRING_ITEM, + TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM, + TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM, + TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM, + TypeHolderExample.JSON_PROPERTY_BOOL_ITEM, + TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM +}) +@JsonTypeName("TypeHolderExample") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class TypeHolderExample { + public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; + private String stringItem; + + public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item"; + private BigDecimal numberItem; + + public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item"; + private Float floatItem; + + public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item"; + private Integer integerItem; + + public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item"; + private Boolean boolItem; + + public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; + private List arrayItem = new ArrayList(); + + public TypeHolderExample stringItem(String stringItem) { + this.stringItem = stringItem; + return this; + } + + /** + * Get stringItem + * @return stringItem + **/ + @NotNull + @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty(JSON_PROPERTY_STRING_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getStringItem() { + return stringItem; + } + + @JsonProperty(JSON_PROPERTY_STRING_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setStringItem(String stringItem) { + this.stringItem = stringItem; + } + + public TypeHolderExample numberItem(BigDecimal numberItem) { + this.numberItem = numberItem; + return this; + } + + /** + * Get numberItem + * @return numberItem + **/ + @NotNull + @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty(JSON_PROPERTY_NUMBER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public BigDecimal getNumberItem() { + return numberItem; + } + + @JsonProperty(JSON_PROPERTY_NUMBER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setNumberItem(BigDecimal numberItem) { + this.numberItem = numberItem; + } + + public TypeHolderExample floatItem(Float floatItem) { + this.floatItem = floatItem; + return this; + } + + /** + * Get floatItem + * @return floatItem + **/ + @NotNull + @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty(JSON_PROPERTY_FLOAT_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Float getFloatItem() { + return floatItem; + } + + @JsonProperty(JSON_PROPERTY_FLOAT_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setFloatItem(Float floatItem) { + this.floatItem = floatItem; + } + + public TypeHolderExample integerItem(Integer integerItem) { + this.integerItem = integerItem; + return this; + } + + /** + * Get integerItem + * @return integerItem + **/ + @NotNull + @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Integer getIntegerItem() { + return integerItem; + } + + @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setIntegerItem(Integer integerItem) { + this.integerItem = integerItem; + } + + public TypeHolderExample boolItem(Boolean boolItem) { + this.boolItem = boolItem; + return this; + } + + /** + * Get boolItem + * @return boolItem + **/ + @NotNull + @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty(JSON_PROPERTY_BOOL_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Boolean getBoolItem() { + return boolItem; + } + + @JsonProperty(JSON_PROPERTY_BOOL_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setBoolItem(Boolean boolItem) { + this.boolItem = boolItem; + } + + public TypeHolderExample arrayItem(List arrayItem) { + this.arrayItem = arrayItem; + return this; + } + + public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + this.arrayItem.add(arrayItemItem); + return this; + } + + /** + * Get arrayItem + * @return arrayItem + **/ + @NotNull + @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public List getArrayItem() { + return arrayItem; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setArrayItem(List arrayItem) { + this.arrayItem = arrayItem; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TypeHolderExample typeHolderExample = (TypeHolderExample) o; + return Objects.equals(this.stringItem, typeHolderExample.stringItem) && + Objects.equals(this.numberItem, typeHolderExample.numberItem) && + Objects.equals(this.floatItem, typeHolderExample.floatItem) && + Objects.equals(this.integerItem, typeHolderExample.integerItem) && + Objects.equals(this.boolItem, typeHolderExample.boolItem) && + Objects.equals(this.arrayItem, typeHolderExample.arrayItem); + } + + @Override + public int hashCode() { + return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class TypeHolderExample {\n"); + sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); + sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); + sb.append(" floatItem: ").append(toIndentedString(floatItem)).append("\n"); + sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); + sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); + sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java new file mode 100644 index 00000000000..caea2374d87 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java @@ -0,0 +1,302 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * User + */ +@JsonPropertyOrder({ + User.JSON_PROPERTY_ID, + User.JSON_PROPERTY_USERNAME, + User.JSON_PROPERTY_FIRST_NAME, + User.JSON_PROPERTY_LAST_NAME, + User.JSON_PROPERTY_EMAIL, + User.JSON_PROPERTY_PASSWORD, + User.JSON_PROPERTY_PHONE, + User.JSON_PROPERTY_USER_STATUS +}) +@JsonTypeName("User") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class User { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + public static final String JSON_PROPERTY_USERNAME = "username"; + private String username; + + public static final String JSON_PROPERTY_FIRST_NAME = "firstName"; + private String firstName; + + public static final String JSON_PROPERTY_LAST_NAME = "lastName"; + private String lastName; + + public static final String JSON_PROPERTY_EMAIL = "email"; + private String email; + + public static final String JSON_PROPERTY_PASSWORD = "password"; + private String password; + + public static final String JSON_PROPERTY_PHONE = "phone"; + private String phone; + + public static final String JSON_PROPERTY_USER_STATUS = "userStatus"; + private Integer userStatus; + + public User id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + public User username(String username) { + this.username = username; + return this; + } + + /** + * Get username + * @return username + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_USERNAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getUsername() { + return username; + } + + @JsonProperty(JSON_PROPERTY_USERNAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUsername(String username) { + this.username = username; + } + + public User firstName(String firstName) { + this.firstName = firstName; + return this; + } + + /** + * Get firstName + * @return firstName + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_FIRST_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getFirstName() { + return firstName; + } + + @JsonProperty(JSON_PROPERTY_FIRST_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public User lastName(String lastName) { + this.lastName = lastName; + return this; + } + + /** + * Get lastName + * @return lastName + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_LAST_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getLastName() { + return lastName; + } + + @JsonProperty(JSON_PROPERTY_LAST_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public User email(String email) { + this.email = email; + return this; + } + + /** + * Get email + * @return email + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_EMAIL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getEmail() { + return email; + } + + @JsonProperty(JSON_PROPERTY_EMAIL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEmail(String email) { + this.email = email; + } + + public User password(String password) { + this.password = password; + return this; + } + + /** + * Get password + * @return password + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PASSWORD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPassword() { + return password; + } + + @JsonProperty(JSON_PROPERTY_PASSWORD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPassword(String password) { + this.password = password; + } + + public User phone(String phone) { + this.phone = phone; + return this; + } + + /** + * Get phone + * @return phone + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PHONE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPhone() { + return phone; + } + + @JsonProperty(JSON_PROPERTY_PHONE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPhone(String phone) { + this.phone = phone; + } + + public User userStatus(Integer userStatus) { + this.userStatus = userStatus; + return this; + } + + /** + * User Status + * @return userStatus + **/ + @Nullable + @ApiModelProperty(value = "User Status") + @JsonProperty(JSON_PROPERTY_USER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getUserStatus() { + return userStatus; + } + + @JsonProperty(JSON_PROPERTY_USER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(this.id, user.id) && + Objects.equals(this.username, user.username) && + Objects.equals(this.firstName, user.firstName) && + Objects.equals(this.lastName, user.lastName) && + Objects.equals(this.email, user.email) && + Objects.equals(this.password, user.password) && + Objects.equals(this.phone, user.phone) && + Objects.equals(this.userStatus, user.userStatus); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java new file mode 100644 index 00000000000..5ef91590040 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java @@ -0,0 +1,986 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.*; + +import javax.validation.constraints.*; +import javax.validation.Valid; +import io.micronaut.core.annotation.*; +import javax.annotation.Generated; + +/** + * XmlItem + */ +@JsonPropertyOrder({ + XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING, + XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER, + XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER, + XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN, + XmlItem.JSON_PROPERTY_WRAPPED_ARRAY, + XmlItem.JSON_PROPERTY_NAME_STRING, + XmlItem.JSON_PROPERTY_NAME_NUMBER, + XmlItem.JSON_PROPERTY_NAME_INTEGER, + XmlItem.JSON_PROPERTY_NAME_BOOLEAN, + XmlItem.JSON_PROPERTY_NAME_ARRAY, + XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY, + XmlItem.JSON_PROPERTY_PREFIX_STRING, + XmlItem.JSON_PROPERTY_PREFIX_NUMBER, + XmlItem.JSON_PROPERTY_PREFIX_INTEGER, + XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN, + XmlItem.JSON_PROPERTY_PREFIX_ARRAY, + XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY, + XmlItem.JSON_PROPERTY_NAMESPACE_STRING, + XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER, + XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER, + XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN, + XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY, + XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY, + XmlItem.JSON_PROPERTY_PREFIX_NS_STRING, + XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER, + XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER, + XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN, + XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY, + XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY +}) +@JsonTypeName("XmlItem") +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Introspected +public class XmlItem { + public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string"; + private String attributeString; + + public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number"; + private BigDecimal attributeNumber; + + public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer"; + private Integer attributeInteger; + + public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean"; + private Boolean attributeBoolean; + + public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; + private List wrappedArray = null; + + public static final String JSON_PROPERTY_NAME_STRING = "name_string"; + private String nameString; + + public static final String JSON_PROPERTY_NAME_NUMBER = "name_number"; + private BigDecimal nameNumber; + + public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer"; + private Integer nameInteger; + + public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean"; + private Boolean nameBoolean; + + public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; + private List nameArray = null; + + public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; + private List nameWrappedArray = null; + + public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; + private String prefixString; + + public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number"; + private BigDecimal prefixNumber; + + public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer"; + private Integer prefixInteger; + + public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean"; + private Boolean prefixBoolean; + + public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; + private List prefixArray = null; + + public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; + private List prefixWrappedArray = null; + + public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; + private String namespaceString; + + public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number"; + private BigDecimal namespaceNumber; + + public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer"; + private Integer namespaceInteger; + + public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean"; + private Boolean namespaceBoolean; + + public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; + private List namespaceArray = null; + + public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; + private List namespaceWrappedArray = null; + + public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; + private String prefixNsString; + + public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number"; + private BigDecimal prefixNsNumber; + + public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer"; + private Integer prefixNsInteger; + + public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean"; + private Boolean prefixNsBoolean; + + public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; + private List prefixNsArray = null; + + public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; + private List prefixNsWrappedArray = null; + + public XmlItem attributeString(String attributeString) { + this.attributeString = attributeString; + return this; + } + + /** + * Get attributeString + * @return attributeString + **/ + @Nullable + @ApiModelProperty(example = "string", value = "") + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAttributeString() { + return attributeString; + } + + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAttributeString(String attributeString) { + this.attributeString = attributeString; + } + + public XmlItem attributeNumber(BigDecimal attributeNumber) { + this.attributeNumber = attributeNumber; + return this; + } + + /** + * Get attributeNumber + * @return attributeNumber + **/ + @Nullable + @ApiModelProperty(example = "1.234", value = "") + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getAttributeNumber() { + return attributeNumber; + } + + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAttributeNumber(BigDecimal attributeNumber) { + this.attributeNumber = attributeNumber; + } + + public XmlItem attributeInteger(Integer attributeInteger) { + this.attributeInteger = attributeInteger; + return this; + } + + /** + * Get attributeInteger + * @return attributeInteger + **/ + @Nullable + @ApiModelProperty(example = "-2", value = "") + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getAttributeInteger() { + return attributeInteger; + } + + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAttributeInteger(Integer attributeInteger) { + this.attributeInteger = attributeInteger; + } + + public XmlItem attributeBoolean(Boolean attributeBoolean) { + this.attributeBoolean = attributeBoolean; + return this; + } + + /** + * Get attributeBoolean + * @return attributeBoolean + **/ + @Nullable + @ApiModelProperty(example = "true", value = "") + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getAttributeBoolean() { + return attributeBoolean; + } + + @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAttributeBoolean(Boolean attributeBoolean) { + this.attributeBoolean = attributeBoolean; + } + + public XmlItem wrappedArray(List wrappedArray) { + this.wrappedArray = wrappedArray; + return this; + } + + public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { + if (this.wrappedArray == null) { + this.wrappedArray = new ArrayList(); + } + this.wrappedArray.add(wrappedArrayItem); + return this; + } + + /** + * Get wrappedArray + * @return wrappedArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getWrappedArray() { + return wrappedArray; + } + + @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setWrappedArray(List wrappedArray) { + this.wrappedArray = wrappedArray; + } + + public XmlItem nameString(String nameString) { + this.nameString = nameString; + return this; + } + + /** + * Get nameString + * @return nameString + **/ + @Nullable + @ApiModelProperty(example = "string", value = "") + @JsonProperty(JSON_PROPERTY_NAME_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getNameString() { + return nameString; + } + + @JsonProperty(JSON_PROPERTY_NAME_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameString(String nameString) { + this.nameString = nameString; + } + + public XmlItem nameNumber(BigDecimal nameNumber) { + this.nameNumber = nameNumber; + return this; + } + + /** + * Get nameNumber + * @return nameNumber + **/ + @Nullable + @ApiModelProperty(example = "1.234", value = "") + @JsonProperty(JSON_PROPERTY_NAME_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getNameNumber() { + return nameNumber; + } + + @JsonProperty(JSON_PROPERTY_NAME_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameNumber(BigDecimal nameNumber) { + this.nameNumber = nameNumber; + } + + public XmlItem nameInteger(Integer nameInteger) { + this.nameInteger = nameInteger; + return this; + } + + /** + * Get nameInteger + * @return nameInteger + **/ + @Nullable + @ApiModelProperty(example = "-2", value = "") + @JsonProperty(JSON_PROPERTY_NAME_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getNameInteger() { + return nameInteger; + } + + @JsonProperty(JSON_PROPERTY_NAME_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameInteger(Integer nameInteger) { + this.nameInteger = nameInteger; + } + + public XmlItem nameBoolean(Boolean nameBoolean) { + this.nameBoolean = nameBoolean; + return this; + } + + /** + * Get nameBoolean + * @return nameBoolean + **/ + @Nullable + @ApiModelProperty(example = "true", value = "") + @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getNameBoolean() { + return nameBoolean; + } + + @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameBoolean(Boolean nameBoolean) { + this.nameBoolean = nameBoolean; + } + + public XmlItem nameArray(List nameArray) { + this.nameArray = nameArray; + return this; + } + + public XmlItem addNameArrayItem(Integer nameArrayItem) { + if (this.nameArray == null) { + this.nameArray = new ArrayList(); + } + this.nameArray.add(nameArrayItem); + return this; + } + + /** + * Get nameArray + * @return nameArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getNameArray() { + return nameArray; + } + + @JsonProperty(JSON_PROPERTY_NAME_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameArray(List nameArray) { + this.nameArray = nameArray; + } + + public XmlItem nameWrappedArray(List nameWrappedArray) { + this.nameWrappedArray = nameWrappedArray; + return this; + } + + public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { + if (this.nameWrappedArray == null) { + this.nameWrappedArray = new ArrayList(); + } + this.nameWrappedArray.add(nameWrappedArrayItem); + return this; + } + + /** + * Get nameWrappedArray + * @return nameWrappedArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getNameWrappedArray() { + return nameWrappedArray; + } + + @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNameWrappedArray(List nameWrappedArray) { + this.nameWrappedArray = nameWrappedArray; + } + + public XmlItem prefixString(String prefixString) { + this.prefixString = prefixString; + return this; + } + + /** + * Get prefixString + * @return prefixString + **/ + @Nullable + @ApiModelProperty(example = "string", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPrefixString() { + return prefixString; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixString(String prefixString) { + this.prefixString = prefixString; + } + + public XmlItem prefixNumber(BigDecimal prefixNumber) { + this.prefixNumber = prefixNumber; + return this; + } + + /** + * Get prefixNumber + * @return prefixNumber + **/ + @Nullable + @ApiModelProperty(example = "1.234", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getPrefixNumber() { + return prefixNumber; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNumber(BigDecimal prefixNumber) { + this.prefixNumber = prefixNumber; + } + + public XmlItem prefixInteger(Integer prefixInteger) { + this.prefixInteger = prefixInteger; + return this; + } + + /** + * Get prefixInteger + * @return prefixInteger + **/ + @Nullable + @ApiModelProperty(example = "-2", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getPrefixInteger() { + return prefixInteger; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixInteger(Integer prefixInteger) { + this.prefixInteger = prefixInteger; + } + + public XmlItem prefixBoolean(Boolean prefixBoolean) { + this.prefixBoolean = prefixBoolean; + return this; + } + + /** + * Get prefixBoolean + * @return prefixBoolean + **/ + @Nullable + @ApiModelProperty(example = "true", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getPrefixBoolean() { + return prefixBoolean; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixBoolean(Boolean prefixBoolean) { + this.prefixBoolean = prefixBoolean; + } + + public XmlItem prefixArray(List prefixArray) { + this.prefixArray = prefixArray; + return this; + } + + public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { + if (this.prefixArray == null) { + this.prefixArray = new ArrayList(); + } + this.prefixArray.add(prefixArrayItem); + return this; + } + + /** + * Get prefixArray + * @return prefixArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getPrefixArray() { + return prefixArray; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixArray(List prefixArray) { + this.prefixArray = prefixArray; + } + + public XmlItem prefixWrappedArray(List prefixWrappedArray) { + this.prefixWrappedArray = prefixWrappedArray; + return this; + } + + public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { + if (this.prefixWrappedArray == null) { + this.prefixWrappedArray = new ArrayList(); + } + this.prefixWrappedArray.add(prefixWrappedArrayItem); + return this; + } + + /** + * Get prefixWrappedArray + * @return prefixWrappedArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getPrefixWrappedArray() { + return prefixWrappedArray; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixWrappedArray(List prefixWrappedArray) { + this.prefixWrappedArray = prefixWrappedArray; + } + + public XmlItem namespaceString(String namespaceString) { + this.namespaceString = namespaceString; + return this; + } + + /** + * Get namespaceString + * @return namespaceString + **/ + @Nullable + @ApiModelProperty(example = "string", value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getNamespaceString() { + return namespaceString; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceString(String namespaceString) { + this.namespaceString = namespaceString; + } + + public XmlItem namespaceNumber(BigDecimal namespaceNumber) { + this.namespaceNumber = namespaceNumber; + return this; + } + + /** + * Get namespaceNumber + * @return namespaceNumber + **/ + @Nullable + @ApiModelProperty(example = "1.234", value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getNamespaceNumber() { + return namespaceNumber; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceNumber(BigDecimal namespaceNumber) { + this.namespaceNumber = namespaceNumber; + } + + public XmlItem namespaceInteger(Integer namespaceInteger) { + this.namespaceInteger = namespaceInteger; + return this; + } + + /** + * Get namespaceInteger + * @return namespaceInteger + **/ + @Nullable + @ApiModelProperty(example = "-2", value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getNamespaceInteger() { + return namespaceInteger; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceInteger(Integer namespaceInteger) { + this.namespaceInteger = namespaceInteger; + } + + public XmlItem namespaceBoolean(Boolean namespaceBoolean) { + this.namespaceBoolean = namespaceBoolean; + return this; + } + + /** + * Get namespaceBoolean + * @return namespaceBoolean + **/ + @Nullable + @ApiModelProperty(example = "true", value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getNamespaceBoolean() { + return namespaceBoolean; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceBoolean(Boolean namespaceBoolean) { + this.namespaceBoolean = namespaceBoolean; + } + + public XmlItem namespaceArray(List namespaceArray) { + this.namespaceArray = namespaceArray; + return this; + } + + public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { + if (this.namespaceArray == null) { + this.namespaceArray = new ArrayList(); + } + this.namespaceArray.add(namespaceArrayItem); + return this; + } + + /** + * Get namespaceArray + * @return namespaceArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getNamespaceArray() { + return namespaceArray; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceArray(List namespaceArray) { + this.namespaceArray = namespaceArray; + } + + public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { + this.namespaceWrappedArray = namespaceWrappedArray; + return this; + } + + public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { + if (this.namespaceWrappedArray == null) { + this.namespaceWrappedArray = new ArrayList(); + } + this.namespaceWrappedArray.add(namespaceWrappedArrayItem); + return this; + } + + /** + * Get namespaceWrappedArray + * @return namespaceWrappedArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getNamespaceWrappedArray() { + return namespaceWrappedArray; + } + + @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNamespaceWrappedArray(List namespaceWrappedArray) { + this.namespaceWrappedArray = namespaceWrappedArray; + } + + public XmlItem prefixNsString(String prefixNsString) { + this.prefixNsString = prefixNsString; + return this; + } + + /** + * Get prefixNsString + * @return prefixNsString + **/ + @Nullable + @ApiModelProperty(example = "string", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPrefixNsString() { + return prefixNsString; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsString(String prefixNsString) { + this.prefixNsString = prefixNsString; + } + + public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { + this.prefixNsNumber = prefixNsNumber; + return this; + } + + /** + * Get prefixNsNumber + * @return prefixNsNumber + **/ + @Nullable + @ApiModelProperty(example = "1.234", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public BigDecimal getPrefixNsNumber() { + return prefixNsNumber; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsNumber(BigDecimal prefixNsNumber) { + this.prefixNsNumber = prefixNsNumber; + } + + public XmlItem prefixNsInteger(Integer prefixNsInteger) { + this.prefixNsInteger = prefixNsInteger; + return this; + } + + /** + * Get prefixNsInteger + * @return prefixNsInteger + **/ + @Nullable + @ApiModelProperty(example = "-2", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getPrefixNsInteger() { + return prefixNsInteger; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsInteger(Integer prefixNsInteger) { + this.prefixNsInteger = prefixNsInteger; + } + + public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { + this.prefixNsBoolean = prefixNsBoolean; + return this; + } + + /** + * Get prefixNsBoolean + * @return prefixNsBoolean + **/ + @Nullable + @ApiModelProperty(example = "true", value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getPrefixNsBoolean() { + return prefixNsBoolean; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsBoolean(Boolean prefixNsBoolean) { + this.prefixNsBoolean = prefixNsBoolean; + } + + public XmlItem prefixNsArray(List prefixNsArray) { + this.prefixNsArray = prefixNsArray; + return this; + } + + public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { + if (this.prefixNsArray == null) { + this.prefixNsArray = new ArrayList(); + } + this.prefixNsArray.add(prefixNsArrayItem); + return this; + } + + /** + * Get prefixNsArray + * @return prefixNsArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getPrefixNsArray() { + return prefixNsArray; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsArray(List prefixNsArray) { + this.prefixNsArray = prefixNsArray; + } + + public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { + this.prefixNsWrappedArray = prefixNsWrappedArray; + return this; + } + + public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { + if (this.prefixNsWrappedArray == null) { + this.prefixNsWrappedArray = new ArrayList(); + } + this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); + return this; + } + + /** + * Get prefixNsWrappedArray + * @return prefixNsWrappedArray + **/ + @Nullable + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getPrefixNsWrappedArray() { + return prefixNsWrappedArray; + } + + @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { + this.prefixNsWrappedArray = prefixNsWrappedArray; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + XmlItem xmlItem = (XmlItem) o; + return Objects.equals(this.attributeString, xmlItem.attributeString) && + Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && + Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && + Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && + Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && + Objects.equals(this.nameString, xmlItem.nameString) && + Objects.equals(this.nameNumber, xmlItem.nameNumber) && + Objects.equals(this.nameInteger, xmlItem.nameInteger) && + Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && + Objects.equals(this.nameArray, xmlItem.nameArray) && + Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && + Objects.equals(this.prefixString, xmlItem.prefixString) && + Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && + Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && + Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && + Objects.equals(this.prefixArray, xmlItem.prefixArray) && + Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && + Objects.equals(this.namespaceString, xmlItem.namespaceString) && + Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && + Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && + Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && + Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && + Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && + Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && + Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && + Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && + Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && + Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && + Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); + } + + @Override + public int hashCode() { + return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class XmlItem {\n"); + sb.append(" attributeString: ").append(toIndentedString(attributeString)).append("\n"); + sb.append(" attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n"); + sb.append(" attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n"); + sb.append(" attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n"); + sb.append(" wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n"); + sb.append(" nameString: ").append(toIndentedString(nameString)).append("\n"); + sb.append(" nameNumber: ").append(toIndentedString(nameNumber)).append("\n"); + sb.append(" nameInteger: ").append(toIndentedString(nameInteger)).append("\n"); + sb.append(" nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n"); + sb.append(" nameArray: ").append(toIndentedString(nameArray)).append("\n"); + sb.append(" nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n"); + sb.append(" prefixString: ").append(toIndentedString(prefixString)).append("\n"); + sb.append(" prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n"); + sb.append(" prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n"); + sb.append(" prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n"); + sb.append(" prefixArray: ").append(toIndentedString(prefixArray)).append("\n"); + sb.append(" prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n"); + sb.append(" namespaceString: ").append(toIndentedString(namespaceString)).append("\n"); + sb.append(" namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n"); + sb.append(" namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n"); + sb.append(" namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n"); + sb.append(" namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n"); + sb.append(" namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n"); + sb.append(" prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n"); + sb.append(" prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n"); + sb.append(" prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n"); + sb.append(" prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n"); + sb.append(" prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n"); + sb.append(" prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParam.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParam.java new file mode 100644 index 00000000000..f6b153387d8 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParam.java @@ -0,0 +1,89 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.query; + +import io.micronaut.context.annotation.AliasFor; +import io.micronaut.core.bind.annotation.Bindable; +import javax.annotation.Generated; +import java.lang.annotation.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + + +/** + * Indicates that the parameter is a query parameter + */ +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Documented +@Retention(RUNTIME) +@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE}) +@Bindable +@Inherited +public @interface QueryParam { + + /** + * @return The name of the parameter + */ + @AliasFor(annotation = Bindable.class, member = "value") + String value() default ""; + + /** + * @return The name of the parameter + */ + @AliasFor(annotation = Bindable.class, member = "value") + String name() default ""; + + /** + * @see Bindable#defaultValue() + * @return The default value + */ + @AliasFor(annotation = Bindable.class, member = "defaultValue") + String defaultValue() default ""; + + /** + * @return The format of the given values in the URL + */ + Format format() default Format.CSV; + + /** + * The possible formats of the query parameter in the URL. + * The conversion of various types is according to openapi v3 specification: + * @see openapi v3 specification + * Values are serialized using Jackson object mapper + */ + public static enum Format { + /** + * The values of iterator are comma-delimited. + * Ambiguity can arise if values of Iterator contain commas inside themselves. In such case, the MUTLI format + * should be preferred. + * Null values are not supported and will be removed during the conversion process. + */ + CSV, + /** + * The values are space-delimited, similarly to comma-delimited format. + */ + SSV, + /** + * The values a delimited by pipes "|", similarly to comma-delimited format. + */ + PIPES, + /** + * The values are repeated as separate parameters, e.g.: color=blue&color=black&color=brown. + */ + MULTI, + /** + * The format supports 1-depth recursion into objects with setting each attribute as a separate parameter, e.g.: + * 'color[R]=100&color[G]=200&color[B]=150'. + */ + DEEP_OBJECT + } +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParamBinder.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParamBinder.java new file mode 100644 index 00000000000..302b4bfabe5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/query/QueryParamBinder.java @@ -0,0 +1,175 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.query; + +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.beans.BeanProperty; +import io.micronaut.core.beans.BeanWrapper; +import io.micronaut.core.convert.ArgumentConversionContext; +import io.micronaut.core.convert.ConversionContext; +import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.client.bind.AnnotatedClientArgumentRequestBinder; +import io.micronaut.http.client.bind.ClientRequestUriContext; + +import java.util.Collection; +import java.util.Optional; +import jakarta.inject.Singleton; +import javax.annotation.Generated; + + +@Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen") +@Singleton +public class QueryParamBinder implements AnnotatedClientArgumentRequestBinder { + private static final Character COMMA_DELIMITER = ','; + private static final Character PIPE_DELIMITER = '|'; + private static final Character SPACE_DELIMITER = ' '; + + private final ConversionService conversionService; + + public QueryParamBinder(ConversionService conversionService) { + this.conversionService = conversionService; + } + + @NonNull + @Override + public Class getAnnotationType() { + return QueryParam.class; + } + + @Override + public void bind(@NonNull ArgumentConversionContext context, + @NonNull ClientRequestUriContext uriContext, + @NonNull Object value, + @NonNull MutableHttpRequest request + ) { + String key = context.getAnnotationMetadata().stringValue(QueryParam.class) + .filter(StringUtils::isNotEmpty) + .orElse(context.getArgument().getName()); + + QueryParam.Format format = context.getAnnotationMetadata() + .enumValue(QueryParam.class, "format", QueryParam.Format.class) + .orElse(QueryParam.Format.CSV); + + if (format == QueryParam.Format.DEEP_OBJECT) { + addDeepObjectParameters(context, value, key, uriContext); + } else if (format == QueryParam.Format.MULTI) { + addMultiParameters(context, value, key, uriContext); + } else { + Character delimiter = ' '; + switch (format) { + case SSV: + delimiter = SPACE_DELIMITER; + break; + case PIPES: + delimiter = PIPE_DELIMITER; + break; + case CSV: + delimiter = COMMA_DELIMITER; + break; + default: + } + createSeparatedQueryParam(context, value, delimiter) + .ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } + + private void addMultiParameters( + ArgumentConversionContext context, Object value, String key, ClientRequestUriContext uriContext + ) { + if (value instanceof Iterable) { + // noinspection unechecked + Iterable iterable = (Iterable) value; + + for (Object item : iterable) { + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } else { + convertToString(context, value).ifPresent(v -> uriContext.addQueryParameter(key, v)); + } + } + + private void addDeepObjectParameters( + ArgumentConversionContext context, Object value, String key, ClientRequestUriContext uriContext + ) { + if (value instanceof Iterable) { + StringBuilder builder = new StringBuilder(key); + + Iterable iterable = (Iterable) value; + + int i = 0; + for (Object item: iterable) { + if (item == null) { + continue; + } + String index = String.valueOf(i); + + builder.append('['); + builder.append(index); + builder.append(']'); + + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(builder.toString(), v)); + builder.delete(builder.length() - index.length() - 2, builder.length()); + i++; + } + } else if (value != null) { + StringBuilder builder = new StringBuilder(key); + BeanWrapper wrapper = BeanWrapper.getWrapper(value); + Collection> properties = wrapper.getBeanProperties(); + for (BeanProperty property: properties) { + Object item = property.get(value); + if (item == null) { + continue; + } + builder.append('['); + builder.append(property.getName()); + builder.append(']'); + + convertToString(context, item).ifPresent(v -> uriContext.addQueryParameter(builder.toString(), v)); + builder.delete(builder.length() - property.getName().length() - 2, builder.length()); + } + } + } + + private Optional createSeparatedQueryParam( + ArgumentConversionContext context, Object value, Character delimiter + ) { + if (value instanceof Iterable) { + StringBuilder builder = new StringBuilder(); + // noinspection unechecked + Iterable iterable = (Iterable) value; + + boolean first = true; + for (Object item : iterable) { + Optional opt = convertToString(context, item); + if (opt.isPresent()) { + if (!first) { + builder.append(delimiter); + } + first = false; + builder.append(opt.get()); + } + } + + return Optional.of(builder.toString()); + } else { + return convertToString(context, value); + } + } + + private Optional convertToString(ArgumentConversionContext context, Object value) { + return conversionService.convert(value, ConversionContext.STRING.with(context.getAnnotationMetadata())) + .filter(StringUtils::isNotEmpty); + } +} diff --git a/samples/client/petstore/java-micronaut-client/src/main/resources/application.yml b/samples/client/petstore/java-micronaut-client/src/main/resources/application.yml new file mode 100644 index 00000000000..bf9e0df6cad --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/main/resources/application.yml @@ -0,0 +1,32 @@ +base-path: "http://petstore.swagger.io:80/v2" +context-path: "/v2" + +micronaut: + application: + name: petstore-micronaut + # TODO configure security features + security: + oauth2: + clients: + # An example of how oauth client is filled + # name: + # grant-type: authorization_code | client_credentials + # scopes: [] + # token: + # auth-method: client_secret_basic + # url: "https://" + # client-id: + # client-secret + # An example of how to apply other authorization methods + # authentication: bearer | cookie | session + + + +jackson: + serialization: + writeEnumsUsingToString: true + writeDatesAsTimestamps: false + deserialization: + readEnumsUsingToString: true + failOnUnknownProperties: false + failOnInvalidSubtype: false diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/AnotherFakeApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/AnotherFakeApiSpec.groovy new file mode 100644 index 00000000000..a4a79ed3c06 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/AnotherFakeApiSpec.groovy @@ -0,0 +1,41 @@ +package org.openapitools.api + +import org.openapitools.model.ModelClient +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +import reactor.core.publisher.Mono +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map + + +/** + * API tests for AnotherFakeApi + */ +@MicronautTest +class AnotherFakeApiSpec extends Specification { + + @Inject + AnotherFakeApi api + + + /** + * To test special tags + * + * To test special tags and operation ID starting with number + */ + void "call123testSpecialTags() test"() { + given: + ModelClient _body = null + // ModelClient response = api.call123testSpecialTags(_body).block() + // Mono asyncResponse = api.call123testSpecialTags(_body) + + expect: + true + // TODO: test validations + } + + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeApiSpec.groovy new file mode 100644 index 00000000000..b3b45c1e555 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeApiSpec.groovy @@ -0,0 +1,295 @@ +package org.openapitools.api + +import java.math.BigDecimal +import java.io.File +import org.openapitools.model.FileSchemaTestClass +import java.time.LocalDate +import java.time.LocalDateTime +import org.openapitools.model.ModelClient +import org.openapitools.model.OuterComposite +import org.openapitools.model.User +import org.openapitools.model.XmlItem +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +import reactor.core.publisher.Mono +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map + + +/** + * API tests for FakeApi + */ +@MicronautTest +class FakeApiSpec extends Specification { + + @Inject + FakeApi api + + + /** + * creates an XmlItem + * + * this route creates an XmlItem + */ + void "createXmlItem() test"() { + given: + XmlItem xmlItem = null + // api.createXmlItem(xmlItem).block() + // Mono asyncResponse = api.createXmlItem(xmlItem) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * Test serialization of outer boolean types + */ + void "fakeOuterBooleanSerialize() test"() { + given: + Boolean _body = null + // Boolean response = api.fakeOuterBooleanSerialize(_body).block() + // Mono asyncResponse = api.fakeOuterBooleanSerialize(_body) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * Test serialization of object with outer number type + */ + void "fakeOuterCompositeSerialize() test"() { + given: + OuterComposite _body = null + // OuterComposite response = api.fakeOuterCompositeSerialize(_body).block() + // Mono asyncResponse = api.fakeOuterCompositeSerialize(_body) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * Test serialization of outer number types + */ + void "fakeOuterNumberSerialize() test"() { + given: + BigDecimal _body = null + // BigDecimal response = api.fakeOuterNumberSerialize(_body).block() + // Mono asyncResponse = api.fakeOuterNumberSerialize(_body) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * Test serialization of outer string types + */ + void "fakeOuterStringSerialize() test"() { + given: + String _body = null + // String response = api.fakeOuterStringSerialize(_body).block() + // Mono asyncResponse = api.fakeOuterStringSerialize(_body) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * For this test, the body for this request much reference a schema named `File`. + */ + void "testBodyWithFileSchema() test"() { + given: + FileSchemaTestClass _body = null + // api.testBodyWithFileSchema(_body).block() + // Mono asyncResponse = api.testBodyWithFileSchema(_body) + + expect: + true + // TODO: test validations + } + + + /** + * + */ + void "testBodyWithQueryParams() test"() { + given: + String query = null + User _body = null + // api.testBodyWithQueryParams(query, _body).block() + // Mono asyncResponse = api.testBodyWithQueryParams(query, _body) + + expect: + true + // TODO: test validations + } + + + /** + * To test \"client\" model + * + * To test \"client\" model + */ + void "testClientModel() test"() { + given: + ModelClient _body = null + // ModelClient response = api.testClientModel(_body).block() + // Mono asyncResponse = api.testClientModel(_body) + + expect: + true + // TODO: test validations + } + + + /** + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + */ + void "testEndpointParameters() test"() { + given: + BigDecimal number = null + Double _double = null + String patternWithoutDelimiter = null + byte[] _byte = null + Integer integer = null + Integer int32 = null + Long int64 = null + Float _float = null + String string = null + File binary = null + LocalDate date = null + LocalDateTime dateTime = null + String password = null + String paramCallback = null + // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).block() + // Mono asyncResponse = api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) + + expect: + true + // TODO: test validations + } + + + /** + * To test enum parameters + * + * To test enum parameters + */ + void "testEnumParameters() test"() { + given: + List enumHeaderStringArray = null + String enumHeaderString = null + List enumQueryStringArray = null + String enumQueryString = null + Integer enumQueryInteger = null + Double enumQueryDouble = null + List enumFormStringArray = null + String enumFormString = null + // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString).block() + // Mono asyncResponse = api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString) + + expect: + true + // TODO: test validations + } + + + /** + * Fake endpoint to test group parameters (optional) + * + * Fake endpoint to test group parameters (optional) + */ + void "testGroupParameters() test"() { + given: + Integer requiredStringGroup = null + Boolean requiredBooleanGroup = null + Long requiredInt64Group = null + Integer stringGroup = null + Boolean booleanGroup = null + Long int64Group = null + // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group).block() + // Mono asyncResponse = api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group) + + expect: + true + // TODO: test validations + } + + + /** + * test inline additionalProperties + */ + void "testInlineAdditionalProperties() test"() { + given: + Map param = null + // api.testInlineAdditionalProperties(param).block() + // Mono asyncResponse = api.testInlineAdditionalProperties(param) + + expect: + true + // TODO: test validations + } + + + /** + * test json serialization of form data + */ + void "testJsonFormData() test"() { + given: + String param = null + String param2 = null + // api.testJsonFormData(param, param2).block() + // Mono asyncResponse = api.testJsonFormData(param, param2) + + expect: + true + // TODO: test validations + } + + + /** + * + * + * To test the collection format in query parameters + */ + void "testQueryParameterCollectionFormat() test"() { + given: + List pipe = null + List ioutil = null + List http = null + List url = null + List context = null + // api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context).block() + // Mono asyncResponse = api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context) + + expect: + true + // TODO: test validations + } + + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeClassnameTags123ApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeClassnameTags123ApiSpec.groovy new file mode 100644 index 00000000000..a1ed9f1bff7 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/FakeClassnameTags123ApiSpec.groovy @@ -0,0 +1,41 @@ +package org.openapitools.api + +import org.openapitools.model.ModelClient +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +import reactor.core.publisher.Mono +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map + + +/** + * API tests for FakeClassnameTags123Api + */ +@MicronautTest +class FakeClassnameTags123ApiSpec extends Specification { + + @Inject + FakeClassnameTags123Api api + + + /** + * To test class name in snake case + * + * To test class name in snake case + */ + void "testClassname() test"() { + given: + ModelClient _body = null + // ModelClient response = api.testClassname(_body).block() + // Mono asyncResponse = api.testClassname(_body) + + expect: + true + // TODO: test validations + } + + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/PetApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/PetApiSpec.groovy new file mode 100644 index 00000000000..9133776726e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/PetApiSpec.groovy @@ -0,0 +1,258 @@ +package org.openapitools.api + +import io.micronaut.http.HttpStatus +import io.micronaut.http.client.exceptions.HttpClientResponseException +import org.openapitools.model.Category +import org.openapitools.model.Tag + + +import org.openapitools.model.Pet +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + + +/** + * API tests for PetApi + */ +@MicronautTest +class PetApiSpec extends Specification { + + @Inject + PetApi api + + /** + * Find pet by ID + * Returns a pet when ID < 10. + */ + void "getPetById() test"() { + given: + Long petId = 5L + Pet response = api.getPetById(petId).block() + + expect: + response != null + response.getId() == petId + response.getName() != null + } + + /** + * ID > 10 or nonintegers will simulate API error conditions + */ + void "getPetById() error test"() { + given: + Long petId = -11L + + when: + api.getPetById(petId).block() + + then: + var e = thrown(HttpClientResponseException.class) + e.getMessage() == "Pet not found" + e.getStatus() == HttpStatus.NOT_FOUND + } + + void "add and get pet test"() { + given: + Pet pet = new Pet() + .id(1002L) + .name("Bob") + .status(Pet.StatusEnum.AVAILABLE) + .category(new Category().id(0L).name("string")) + .photoUrls(["string"].toSet()) + .tags([new Tag().id(0L).name("string")]) + + api.addPet(pet).block() + Pet received = api.getPetById(pet.getId()).block() + + expect: + received != null + pet == received + } + + /** + * Finds Pets by status + * Multiple status values can be provided with comma separated strings + */ + void "findPetsByStatus() test"() { + given: + Pet pet = new Pet() + .id(1005L) + .name("Tom") + .status(Pet.StatusEnum.AVAILABLE) + .category(new Category().id(105L).name("Cat category")) + .photoUrls([].toSet()) + .tags([new Tag().id(1L).name("meowing"), new Tag().id(2L).name("purring")]) + + Pet pet2 = new Pet().id(1007L).name("Bob").status(Pet.StatusEnum.AVAILABLE) + Pet pet3 = new Pet().id(1008L).name("Unnamed").status(Pet.StatusEnum.SOLD) + .category(new Category().id(6L).name("Young dog category")) + .tags(new ArrayList<>()).photoUrls([].toSet()) + + when: + api.addPet(pet).block() + api.addPet(pet2).block() + api.addPet(pet3).block() + + List available = api.findPetsByStatus(["available"]).block() + List sold = api.findPetsByStatus(["sold"]).block() + // The description says that it needs to be comma separated, but the actual format is multi + List both = api.findPetsByStatus(["available,sold"]).block() + + then: + // Available pets + available != null + and: "The first pet should be present and match the added pet" + Pet receivedPet = available.stream().filter(p -> p.getId() == pet.getId()).findFirst().orElse(null) + receivedPet != null + pet == receivedPet + and: "The second added pet should be present in the available pets" + available.stream().anyMatch(p -> p.getId() == pet2.getId() && p.getName() == pet2.getName()) + and: "The third pet was sold and should not be present in available pets" + available.stream().allMatch(p -> p.getId() != pet3.getId()) + + // Sold pets + and: "The third added pet should be present in the sold pets" + sold.stream().anyMatch(p -> p.getId() == pet3.getId() && p.getName() == pet3.getName()) + and: "The first pet was sold and should not be present in available pets" + sold.stream().allMatch(p -> p.getId() != pet.getId()) + and: "The second pet was sold and should not be present in available pets" + sold.stream().allMatch(p -> p.getId() != pet2.getId()) + + // Both pets + // The formatting of query needs to be correct for this one + and: "The third pet should be present in all the pets and match the added pet" + Pet receivedPet3 = both.stream().filter(p -> p.getId() == pet3.getId()).findFirst().orElse(null) + receivedPet3 != null + pet3 == receivedPet3 + and: "The second added pet should be present in the all pets" + both.stream().anyMatch(p -> p.getId() == pet2.getId() && p.getName() == pet2.getName()) + and: "The first added pet should be present in the all pets" + both.stream().anyMatch(p -> p.getId() == pet.getId() && p.getName() == pet.getName()) + } + + void "delete non-existing pet error test"() { + when: + api.deletePet(-1L, "special-key").block() + + then: + var e = thrown(HttpClientResponseException.class) + e.getMessage() == "Not Found" + } + + void "add and delete pet test"() { + given: + List status = ["available"] + + List initialPets = api.findPetsByStatus(status).block() + + when: + Pet pet1 = new Pet().id(101L).name("Bob").status(Pet.StatusEnum.AVAILABLE) + Pet pet2 = new Pet().id(103L).name("Rat").status(Pet.StatusEnum.AVAILABLE) + api.addPet(pet1).block() + api.addPet(pet2).block() + + List pets = api.findPetsByStatus(status).block() + + then: "The 2 pets should have been added correctly" + pets != null + pets.size() - initialPets.size() == 2 + pets.stream().anyMatch(p -> p.getId() == pet1.getId() && p.getName() == pet1.getName()) + pets.stream().anyMatch(p -> p.getId() == pet2.getId() && p.getName() == pet2.getName()) + + when: + api.deletePet(pet1.getId(), "special-key").block() + api.deletePet(pet2.getId(), "special-key").block() + + List finalPets = api.findPetsByStatus(status).block() + + then: "The 2 pets should have been deleted" + finalPets != null + pets.size() - finalPets.size() == 2 + finalPets.stream().allMatch(p -> p.getId() != pet1.getId()) + finalPets.stream().allMatch(p -> p.getId() != pet2.getId()) + } + + /** + * Update an existing pet + */ + void "updatePet() test"() { + given: + Pet pet = new Pet().id(1L).name("Jazz") + + when: + api.updatePet(pet).block() + + then: "The pet should be available and match the updates" + Pet received = api.getPetById(1L).block() + pet.getId() == received.getId() + pet.getName() == received.getName() + } + + + /** + * Updates a pet in the store with form data + */ + void "updatePetWithForm() test"() { + given: + Long petId = 2L + String name = "Jack the Bull" + String status = "sold" + + when: + api.updatePetWithForm(petId, name, status).block() + + then: + Pet pet = api.getPetById(2L).block() + petId == pet.getId() + name == pet.getName() + status == pet.getStatus().toString() + } + + + /** + * uploads an image + */ + void "upload file test"() throws IOException { + given: + Long petId = 2L + String additionalMetadata = "a test file" + + File file = new File("hello.txt") + BufferedWriter writer = new BufferedWriter(new FileWriter(file)) + writer.write("Hello world!") + writer.close() + + when: + api.uploadFile(petId, additionalMetadata, new File(file.getAbsolutePath())) + + then: + notThrown() + } + + void "findPetByTags() test"() { + given: + Tag tag = new Tag().name("cute").id(2L) + + Pet pet1 = new Pet().id(2000L).name("Conor").category(new Category().name("cats").id(10L)) + .photoUrls([].toSet()).tags([tag]) + Pet pet2 = new Pet().id(2001L).name("Mike").category(new Category().name("dogs").id(10L)) + .photoUrls([].toSet()).tags([tag]) + + when: + api.addPet(pet1).block() + api.addPet(pet2).block() + + then: "The 2 pets should be successfully found with the given tag" + Set pets = api.findPetsByTags([tag.getName()].toSet()).block() + + pets.stream().allMatch(p -> p.getTags().contains(tag)) + + Pet receivedPet1 = pets.stream().filter(p -> p.getId() == pet1.getId()).findFirst().orElse(null) + Pet receivedPet2 = pets.stream().filter(p -> p.getId() == pet2.getId()).findFirst().orElse(null) + receivedPet1 != null + receivedPet2 != null + pet1 == receivedPet1 + pet2 == receivedPet2 + } +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy new file mode 100644 index 00000000000..157f85ee7c7 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy @@ -0,0 +1,79 @@ +package org.openapitools.api + +import io.micronaut.http.client.exceptions.HttpClientResponseException +import org.openapitools.model.Order +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Ignore +import spock.lang.Specification +import jakarta.inject.Inject +import java.time.LocalDateTime + + +/** + * API tests for StoreApi + */ +@MicronautTest +public class StoreApiSpec extends Specification { + + @Inject + StoreApi api + + /** + * Place an order for a pet + */ + @Ignore("The test fails because the produces is specified as */* instead of a specific value") + void "placeOrder() test"() { + given: + Order order = new Order().id(1L).shipDate(LocalDateTime.MIN).complete(true) + .petId(5L).quantity(1).status(Order.StatusEnum.DELIVERED) + + when: + Order response = api.placeOrder(order).block() + + then: + order == response + } + + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + */ + void "getInventory() test"() { + when: + Map response = api.getInventory().block() + + then: + response != null + } + + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + */ + void "getOrderById() test"() { + when: + Long orderId = 4L + Order response = api.getOrderById(orderId).block() + + then: + response != null + orderId == response.getId() + } + + + /** + * Delete purchase order by ID + * + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + */ + void "deleteOrder() not existing order error test"() { + given: + String orderId = "1001" + + when: + api.deleteOrder(orderId).block() + + then: + thrown(HttpClientResponseException) + } +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/UserApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/UserApiSpec.groovy new file mode 100644 index 00000000000..81e8400577e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/UserApiSpec.groovy @@ -0,0 +1,151 @@ +package org.openapitools.api + +import org.openapitools.model.User +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject +import reactor.core.publisher.Mono +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map + + +/** + * API tests for UserApi + */ +@MicronautTest +class UserApiSpec extends Specification { + + @Inject + UserApi api + + + /** + * Create user + * + * This can only be done by the logged in user. + */ + void "createUser() test"() { + given: + User _body = null + // api.createUser(_body).block() + // Mono asyncResponse = api.createUser(_body) + + expect: + true + // TODO: test validations + } + + + /** + * Creates list of users with given input array + */ + void "createUsersWithArrayInput() test"() { + given: + List _body = null + // api.createUsersWithArrayInput(_body).block() + // Mono asyncResponse = api.createUsersWithArrayInput(_body) + + expect: + true + // TODO: test validations + } + + + /** + * Creates list of users with given input array + */ + void "createUsersWithListInput() test"() { + given: + List _body = null + // api.createUsersWithListInput(_body).block() + // Mono asyncResponse = api.createUsersWithListInput(_body) + + expect: + true + // TODO: test validations + } + + + /** + * Delete user + * + * This can only be done by the logged in user. + */ + void "deleteUser() test"() { + given: + String username = null + // api.deleteUser(username).block() + // Mono asyncResponse = api.deleteUser(username) + + expect: + true + // TODO: test validations + } + + + /** + * Get user by user name + */ + void "getUserByName() test"() { + given: + String username = null + // User response = api.getUserByName(username).block() + // Mono asyncResponse = api.getUserByName(username) + + expect: + true + // TODO: test validations + } + + + /** + * Logs user into the system + */ + void "loginUser() test"() { + given: + String username = null + String password = null + // String response = api.loginUser(username, password).block() + // Mono asyncResponse = api.loginUser(username, password) + + expect: + true + // TODO: test validations + } + + + /** + * Logs out current logged in user session + */ + void "logoutUser() test"() { + given: + // api.logoutUser().block() + // Mono asyncResponse = api.logoutUser() + + expect: + true + // TODO: test validations + } + + + /** + * Updated user + * + * This can only be done by the logged in user. + */ + void "updateUser() test"() { + given: + String username = null + User _body = null + // api.updateUser(username, _body).block() + // Mono asyncResponse = api.updateUser(username, _body) + + expect: + true + // TODO: test validations + } + + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesAnyTypeSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesAnyTypeSpec.groovy new file mode 100644 index 00000000000..cf38af5eb11 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesAnyTypeSpec.groovy @@ -0,0 +1,32 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesAnyType + */ +@MicronautTest +public class AdditionalPropertiesAnyTypeSpec extends Specification { + private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType() + + /** + * Model tests for AdditionalPropertiesAnyType + */ + void "AdditionalPropertiesAnyType test"() { + // TODO: test AdditionalPropertiesAnyType + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesAnyType property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesArraySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesArraySpec.groovy new file mode 100644 index 00000000000..7724dbd9d71 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesArraySpec.groovy @@ -0,0 +1,33 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.List +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesArray + */ +@MicronautTest +public class AdditionalPropertiesArraySpec extends Specification { + private final AdditionalPropertiesArray model = new AdditionalPropertiesArray() + + /** + * Model tests for AdditionalPropertiesArray + */ + void "AdditionalPropertiesArray test"() { + // TODO: test AdditionalPropertiesArray + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesArray property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesBooleanSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesBooleanSpec.groovy new file mode 100644 index 00000000000..a0a8981087d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesBooleanSpec.groovy @@ -0,0 +1,32 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesBoolean + */ +@MicronautTest +public class AdditionalPropertiesBooleanSpec extends Specification { + private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean() + + /** + * Model tests for AdditionalPropertiesBoolean + */ + void "AdditionalPropertiesBoolean test"() { + // TODO: test AdditionalPropertiesBoolean + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesBoolean property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesClassSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesClassSpec.groovy new file mode 100644 index 00000000000..f11a43776d4 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesClassSpec.groovy @@ -0,0 +1,104 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.HashMap +import java.util.List +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesClass + */ +@MicronautTest +public class AdditionalPropertiesClassSpec extends Specification { + private final AdditionalPropertiesClass model = new AdditionalPropertiesClass() + + /** + * Model tests for AdditionalPropertiesClass + */ + void "AdditionalPropertiesClass test"() { + // TODO: test AdditionalPropertiesClass + } + + /** + * Test the property 'mapString' + */ + void "AdditionalPropertiesClass property mapString test"() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + void "AdditionalPropertiesClass property mapNumber test"() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + void "AdditionalPropertiesClass property mapInteger test"() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + void "AdditionalPropertiesClass property mapBoolean test"() { + // TODO: test mapBoolean + } + + /** + * Test the property 'mapArrayInteger' + */ + void "AdditionalPropertiesClass property mapArrayInteger test"() { + // TODO: test mapArrayInteger + } + + /** + * Test the property 'mapArrayAnytype' + */ + void "AdditionalPropertiesClass property mapArrayAnytype test"() { + // TODO: test mapArrayAnytype + } + + /** + * Test the property 'mapMapString' + */ + void "AdditionalPropertiesClass property mapMapString test"() { + // TODO: test mapMapString + } + + /** + * Test the property 'mapMapAnytype' + */ + void "AdditionalPropertiesClass property mapMapAnytype test"() { + // TODO: test mapMapAnytype + } + + /** + * Test the property 'anytype1' + */ + void "AdditionalPropertiesClass property anytype1 test"() { + // TODO: test anytype1 + } + + /** + * Test the property 'anytype2' + */ + void "AdditionalPropertiesClass property anytype2 test"() { + // TODO: test anytype2 + } + + /** + * Test the property 'anytype3' + */ + void "AdditionalPropertiesClass property anytype3 test"() { + // TODO: test anytype3 + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesIntegerSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesIntegerSpec.groovy new file mode 100644 index 00000000000..160361ef1ec --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesIntegerSpec.groovy @@ -0,0 +1,32 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesInteger + */ +@MicronautTest +public class AdditionalPropertiesIntegerSpec extends Specification { + private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger() + + /** + * Model tests for AdditionalPropertiesInteger + */ + void "AdditionalPropertiesInteger test"() { + // TODO: test AdditionalPropertiesInteger + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesInteger property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesNumberSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesNumberSpec.groovy new file mode 100644 index 00000000000..ec09dae257c --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesNumberSpec.groovy @@ -0,0 +1,33 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesNumber + */ +@MicronautTest +public class AdditionalPropertiesNumberSpec extends Specification { + private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber() + + /** + * Model tests for AdditionalPropertiesNumber + */ + void "AdditionalPropertiesNumber test"() { + // TODO: test AdditionalPropertiesNumber + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesNumber property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesObjectSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesObjectSpec.groovy new file mode 100644 index 00000000000..013a6271f48 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesObjectSpec.groovy @@ -0,0 +1,32 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesObject + */ +@MicronautTest +public class AdditionalPropertiesObjectSpec extends Specification { + private final AdditionalPropertiesObject model = new AdditionalPropertiesObject() + + /** + * Model tests for AdditionalPropertiesObject + */ + void "AdditionalPropertiesObject test"() { + // TODO: test AdditionalPropertiesObject + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesObject property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesStringSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesStringSpec.groovy new file mode 100644 index 00000000000..c7eb9462b92 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesStringSpec.groovy @@ -0,0 +1,32 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for AdditionalPropertiesString + */ +@MicronautTest +public class AdditionalPropertiesStringSpec extends Specification { + private final AdditionalPropertiesString model = new AdditionalPropertiesString() + + /** + * Model tests for AdditionalPropertiesString + */ + void "AdditionalPropertiesString test"() { + // TODO: test AdditionalPropertiesString + } + + /** + * Test the property 'name' + */ + void "AdditionalPropertiesString property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AnimalSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AnimalSpec.groovy new file mode 100644 index 00000000000..11fcb24d201 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AnimalSpec.groovy @@ -0,0 +1,39 @@ +package org.openapitools.model + +import com.fasterxml.jackson.annotation.JsonSubTypes +import com.fasterxml.jackson.annotation.JsonTypeInfo +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Animal + */ +@MicronautTest +public class AnimalSpec extends Specification { + private final Animal model = new Animal() + + /** + * Model tests for Animal + */ + void "Animal test"() { + // TODO: test Animal + } + + /** + * Test the property 'className' + */ + void "Animal property className test"() { + // TODO: test className + } + + /** + * Test the property 'color' + */ + void "Animal property color test"() { + // TODO: test color + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfArrayOfNumberOnlySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfArrayOfNumberOnlySpec.groovy new file mode 100644 index 00000000000..d364a888027 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfArrayOfNumberOnlySpec.groovy @@ -0,0 +1,33 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ArrayOfArrayOfNumberOnly + */ +@MicronautTest +public class ArrayOfArrayOfNumberOnlySpec extends Specification { + private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly() + + /** + * Model tests for ArrayOfArrayOfNumberOnly + */ + void "ArrayOfArrayOfNumberOnly test"() { + // TODO: test ArrayOfArrayOfNumberOnly + } + + /** + * Test the property 'arrayArrayNumber' + */ + void "ArrayOfArrayOfNumberOnly property arrayArrayNumber test"() { + // TODO: test arrayArrayNumber + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfNumberOnlySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfNumberOnlySpec.groovy new file mode 100644 index 00000000000..750d991c189 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfNumberOnlySpec.groovy @@ -0,0 +1,33 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ArrayOfNumberOnly + */ +@MicronautTest +public class ArrayOfNumberOnlySpec extends Specification { + private final ArrayOfNumberOnly model = new ArrayOfNumberOnly() + + /** + * Model tests for ArrayOfNumberOnly + */ + void "ArrayOfNumberOnly test"() { + // TODO: test ArrayOfNumberOnly + } + + /** + * Test the property 'arrayNumber' + */ + void "ArrayOfNumberOnly property arrayNumber test"() { + // TODO: test arrayNumber + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayTestSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayTestSpec.groovy new file mode 100644 index 00000000000..14067f25c49 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayTestSpec.groovy @@ -0,0 +1,47 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.ArrayList +import java.util.List +import org.openapitools.model.ReadOnlyFirst +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ArrayTest + */ +@MicronautTest +public class ArrayTestSpec extends Specification { + private final ArrayTest model = new ArrayTest() + + /** + * Model tests for ArrayTest + */ + void "ArrayTest test"() { + // TODO: test ArrayTest + } + + /** + * Test the property 'arrayOfString' + */ + void "ArrayTest property arrayOfString test"() { + // TODO: test arrayOfString + } + + /** + * Test the property 'arrayArrayOfInteger' + */ + void "ArrayTest property arrayArrayOfInteger test"() { + // TODO: test arrayArrayOfInteger + } + + /** + * Test the property 'arrayArrayOfModel' + */ + void "ArrayTest property arrayArrayOfModel test"() { + // TODO: test arrayArrayOfModel + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatAllOfSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatAllOfSpec.groovy new file mode 100644 index 00000000000..9e56d921ef1 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatAllOfSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for BigCatAllOf + */ +@MicronautTest +public class BigCatAllOfSpec extends Specification { + private final BigCatAllOf model = new BigCatAllOf() + + /** + * Model tests for BigCatAllOf + */ + void "BigCatAllOf test"() { + // TODO: test BigCatAllOf + } + + /** + * Test the property 'kind' + */ + void "BigCatAllOf property kind test"() { + // TODO: test kind + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatSpec.groovy new file mode 100644 index 00000000000..3edb46ca10e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatSpec.groovy @@ -0,0 +1,53 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import org.openapitools.model.BigCatAllOf +import org.openapitools.model.Cat +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for BigCat + */ +@MicronautTest +public class BigCatSpec extends Specification { + private final BigCat model = new BigCat() + + /** + * Model tests for BigCat + */ + void "BigCat test"() { + // TODO: test BigCat + } + + /** + * Test the property 'className' + */ + void "BigCat property className test"() { + // TODO: test className + } + + /** + * Test the property 'color' + */ + void "BigCat property color test"() { + // TODO: test color + } + + /** + * Test the property 'declawed' + */ + void "BigCat property declawed test"() { + // TODO: test declawed + } + + /** + * Test the property 'kind' + */ + void "BigCat property kind test"() { + // TODO: test kind + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CapitalizationSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CapitalizationSpec.groovy new file mode 100644 index 00000000000..5ffc7f1d8bf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CapitalizationSpec.groovy @@ -0,0 +1,65 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Capitalization + */ +@MicronautTest +public class CapitalizationSpec extends Specification { + private final Capitalization model = new Capitalization() + + /** + * Model tests for Capitalization + */ + void "Capitalization test"() { + // TODO: test Capitalization + } + + /** + * Test the property 'smallCamel' + */ + void "Capitalization property smallCamel test"() { + // TODO: test smallCamel + } + + /** + * Test the property 'capitalCamel' + */ + void "Capitalization property capitalCamel test"() { + // TODO: test capitalCamel + } + + /** + * Test the property 'smallSnake' + */ + void "Capitalization property smallSnake test"() { + // TODO: test smallSnake + } + + /** + * Test the property 'capitalSnake' + */ + void "Capitalization property capitalSnake test"() { + // TODO: test capitalSnake + } + + /** + * Test the property 'scAETHFlowPoints' + */ + void "Capitalization property scAETHFlowPoints test"() { + // TODO: test scAETHFlowPoints + } + + /** + * Test the property 'ATT_NAME' + */ + void "Capitalization property ATT_NAME test"() { + // TODO: test ATT_NAME + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatAllOfSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatAllOfSpec.groovy new file mode 100644 index 00000000000..c4762339d43 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatAllOfSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for CatAllOf + */ +@MicronautTest +public class CatAllOfSpec extends Specification { + private final CatAllOf model = new CatAllOf() + + /** + * Model tests for CatAllOf + */ + void "CatAllOf test"() { + // TODO: test CatAllOf + } + + /** + * Test the property 'declawed' + */ + void "CatAllOf property declawed test"() { + // TODO: test declawed + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatSpec.groovy new file mode 100644 index 00000000000..eede5552627 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatSpec.groovy @@ -0,0 +1,46 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import org.openapitools.model.Animal +import org.openapitools.model.CatAllOf +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Cat + */ +@MicronautTest +public class CatSpec extends Specification { + private final Cat model = new Cat() + + /** + * Model tests for Cat + */ + void "Cat test"() { + // TODO: test Cat + } + + /** + * Test the property 'className' + */ + void "Cat property className test"() { + // TODO: test className + } + + /** + * Test the property 'color' + */ + void "Cat property color test"() { + // TODO: test color + } + + /** + * Test the property 'declawed' + */ + void "Cat property declawed test"() { + // TODO: test declawed + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CategorySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CategorySpec.groovy new file mode 100644 index 00000000000..58e243ddfae --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CategorySpec.groovy @@ -0,0 +1,37 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Category + */ +@MicronautTest +public class CategorySpec extends Specification { + private final Category model = new Category() + + /** + * Model tests for Category + */ + void "Category test"() { + // TODO: test Category + } + + /** + * Test the property 'id' + */ + void "Category property id test"() { + // TODO: test id + } + + /** + * Test the property 'name' + */ + void "Category property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ClassModelSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ClassModelSpec.groovy new file mode 100644 index 00000000000..491cd582644 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ClassModelSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ClassModel + */ +@MicronautTest +public class ClassModelSpec extends Specification { + private final ClassModel model = new ClassModel() + + /** + * Model tests for ClassModel + */ + void "ClassModel test"() { + // TODO: test ClassModel + } + + /** + * Test the property 'propertyClass' + */ + void "ClassModel property propertyClass test"() { + // TODO: test propertyClass + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogAllOfSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogAllOfSpec.groovy new file mode 100644 index 00000000000..733d8487c5d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogAllOfSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for DogAllOf + */ +@MicronautTest +public class DogAllOfSpec extends Specification { + private final DogAllOf model = new DogAllOf() + + /** + * Model tests for DogAllOf + */ + void "DogAllOf test"() { + // TODO: test DogAllOf + } + + /** + * Test the property 'breed' + */ + void "DogAllOf property breed test"() { + // TODO: test breed + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogSpec.groovy new file mode 100644 index 00000000000..b56f98b8fc5 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogSpec.groovy @@ -0,0 +1,46 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import org.openapitools.model.Animal +import org.openapitools.model.DogAllOf +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Dog + */ +@MicronautTest +public class DogSpec extends Specification { + private final Dog model = new Dog() + + /** + * Model tests for Dog + */ + void "Dog test"() { + // TODO: test Dog + } + + /** + * Test the property 'className' + */ + void "Dog property className test"() { + // TODO: test className + } + + /** + * Test the property 'color' + */ + void "Dog property color test"() { + // TODO: test color + } + + /** + * Test the property 'breed' + */ + void "Dog property breed test"() { + // TODO: test breed + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumArraysSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumArraysSpec.groovy new file mode 100644 index 00000000000..fd3f8cd8c1e --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumArraysSpec.groovy @@ -0,0 +1,39 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for EnumArrays + */ +@MicronautTest +public class EnumArraysSpec extends Specification { + private final EnumArrays model = new EnumArrays() + + /** + * Model tests for EnumArrays + */ + void "EnumArrays test"() { + // TODO: test EnumArrays + } + + /** + * Test the property 'justSymbol' + */ + void "EnumArrays property justSymbol test"() { + // TODO: test justSymbol + } + + /** + * Test the property 'arrayEnum' + */ + void "EnumArrays property arrayEnum test"() { + // TODO: test arrayEnum + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumClassSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumClassSpec.groovy new file mode 100644 index 00000000000..fb0f558262d --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumClassSpec.groovy @@ -0,0 +1,19 @@ +package org.openapitools.model + +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for EnumClass + */ +@MicronautTest +public class EnumClassSpec extends Specification { + /** + * Model tests for EnumClass + */ + void "EnumClass test"() { + // TODO: test EnumClass + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumTestSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumTestSpec.groovy new file mode 100644 index 00000000000..5b1e4a3b87a --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumTestSpec.groovy @@ -0,0 +1,59 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import org.openapitools.model.OuterEnum +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for EnumTest + */ +@MicronautTest +public class EnumTestSpec extends Specification { + private final EnumTest model = new EnumTest() + + /** + * Model tests for EnumTest + */ + void "EnumTest test"() { + // TODO: test EnumTest + } + + /** + * Test the property 'enumString' + */ + void "EnumTest property enumString test"() { + // TODO: test enumString + } + + /** + * Test the property 'enumStringRequired' + */ + void "EnumTest property enumStringRequired test"() { + // TODO: test enumStringRequired + } + + /** + * Test the property 'enumInteger' + */ + void "EnumTest property enumInteger test"() { + // TODO: test enumInteger + } + + /** + * Test the property 'enumNumber' + */ + void "EnumTest property enumNumber test"() { + // TODO: test enumNumber + } + + /** + * Test the property 'outerEnum' + */ + void "EnumTest property outerEnum test"() { + // TODO: test outerEnum + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FileSchemaTestClassSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FileSchemaTestClassSpec.groovy new file mode 100644 index 00000000000..d4c964acb4b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FileSchemaTestClassSpec.groovy @@ -0,0 +1,39 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for FileSchemaTestClass + */ +@MicronautTest +public class FileSchemaTestClassSpec extends Specification { + private final FileSchemaTestClass model = new FileSchemaTestClass() + + /** + * Model tests for FileSchemaTestClass + */ + void "FileSchemaTestClass test"() { + // TODO: test FileSchemaTestClass + } + + /** + * Test the property 'file' + */ + void "FileSchemaTestClass property file test"() { + // TODO: test file + } + + /** + * Test the property 'files' + */ + void "FileSchemaTestClass property files test"() { + // TODO: test files + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FormatTestSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FormatTestSpec.groovy new file mode 100644 index 00000000000..042fe9c5f7a --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FormatTestSpec.groovy @@ -0,0 +1,126 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.io.File +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime +import java.util.UUID +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for FormatTest + */ +@MicronautTest +public class FormatTestSpec extends Specification { + private final FormatTest model = new FormatTest() + + /** + * Model tests for FormatTest + */ + void "FormatTest test"() { + // TODO: test FormatTest + } + + /** + * Test the property 'integer' + */ + void "FormatTest property integer test"() { + // TODO: test integer + } + + /** + * Test the property 'int32' + */ + void "FormatTest property int32 test"() { + // TODO: test int32 + } + + /** + * Test the property 'int64' + */ + void "FormatTest property int64 test"() { + // TODO: test int64 + } + + /** + * Test the property 'number' + */ + void "FormatTest property number test"() { + // TODO: test number + } + + /** + * Test the property '_float' + */ + void "FormatTest property _float test"() { + // TODO: test _float + } + + /** + * Test the property '_double' + */ + void "FormatTest property _double test"() { + // TODO: test _double + } + + /** + * Test the property 'string' + */ + void "FormatTest property string test"() { + // TODO: test string + } + + /** + * Test the property '_byte' + */ + void "FormatTest property _byte test"() { + // TODO: test _byte + } + + /** + * Test the property 'binary' + */ + void "FormatTest property binary test"() { + // TODO: test binary + } + + /** + * Test the property 'date' + */ + void "FormatTest property date test"() { + // TODO: test date + } + + /** + * Test the property 'dateTime' + */ + void "FormatTest property dateTime test"() { + // TODO: test dateTime + } + + /** + * Test the property 'uuid' + */ + void "FormatTest property uuid test"() { + // TODO: test uuid + } + + /** + * Test the property 'password' + */ + void "FormatTest property password test"() { + // TODO: test password + } + + /** + * Test the property 'bigDecimal' + */ + void "FormatTest property bigDecimal test"() { + // TODO: test bigDecimal + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/HasOnlyReadOnlySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/HasOnlyReadOnlySpec.groovy new file mode 100644 index 00000000000..dc494b74eab --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/HasOnlyReadOnlySpec.groovy @@ -0,0 +1,37 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for HasOnlyReadOnly + */ +@MicronautTest +public class HasOnlyReadOnlySpec extends Specification { + private final HasOnlyReadOnly model = new HasOnlyReadOnly() + + /** + * Model tests for HasOnlyReadOnly + */ + void "HasOnlyReadOnly test"() { + // TODO: test HasOnlyReadOnly + } + + /** + * Test the property 'bar' + */ + void "HasOnlyReadOnly property bar test"() { + // TODO: test bar + } + + /** + * Test the property 'foo' + */ + void "HasOnlyReadOnly property foo test"() { + // TODO: test foo + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MapTestSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MapTestSpec.groovy new file mode 100644 index 00000000000..80a970ab70b --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MapTestSpec.groovy @@ -0,0 +1,54 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.HashMap +import java.util.List +import java.util.Map +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for MapTest + */ +@MicronautTest +public class MapTestSpec extends Specification { + private final MapTest model = new MapTest() + + /** + * Model tests for MapTest + */ + void "MapTest test"() { + // TODO: test MapTest + } + + /** + * Test the property 'mapMapOfString' + */ + void "MapTest property mapMapOfString test"() { + // TODO: test mapMapOfString + } + + /** + * Test the property 'mapOfEnumString' + */ + void "MapTest property mapOfEnumString test"() { + // TODO: test mapOfEnumString + } + + /** + * Test the property 'directMap' + */ + void "MapTest property directMap test"() { + // TODO: test directMap + } + + /** + * Test the property 'indirectMap' + */ + void "MapTest property indirectMap test"() { + // TODO: test indirectMap + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassSpec.groovy new file mode 100644 index 00000000000..6beabf63499 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassSpec.groovy @@ -0,0 +1,50 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.time.LocalDateTime +import java.util.HashMap +import java.util.List +import java.util.Map +import java.util.UUID +import org.openapitools.model.Animal +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ +@MicronautTest +public class MixedPropertiesAndAdditionalPropertiesClassSpec extends Specification { + private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass() + + /** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ + void "MixedPropertiesAndAdditionalPropertiesClass test"() { + // TODO: test MixedPropertiesAndAdditionalPropertiesClass + } + + /** + * Test the property 'uuid' + */ + void "MixedPropertiesAndAdditionalPropertiesClass property uuid test"() { + // TODO: test uuid + } + + /** + * Test the property 'dateTime' + */ + void "MixedPropertiesAndAdditionalPropertiesClass property dateTime test"() { + // TODO: test dateTime + } + + /** + * Test the property 'map' + */ + void "MixedPropertiesAndAdditionalPropertiesClass property map test"() { + // TODO: test map + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/Model200ResponseSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/Model200ResponseSpec.groovy new file mode 100644 index 00000000000..97093ff2eba --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/Model200ResponseSpec.groovy @@ -0,0 +1,37 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Model200Response + */ +@MicronautTest +public class Model200ResponseSpec extends Specification { + private final Model200Response model = new Model200Response() + + /** + * Model tests for Model200Response + */ + void "Model200Response test"() { + // TODO: test Model200Response + } + + /** + * Test the property 'name' + */ + void "Model200Response property name test"() { + // TODO: test name + } + + /** + * Test the property 'propertyClass' + */ + void "Model200Response property propertyClass test"() { + // TODO: test propertyClass + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelApiResponseSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelApiResponseSpec.groovy new file mode 100644 index 00000000000..344e6736457 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelApiResponseSpec.groovy @@ -0,0 +1,44 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ModelApiResponse + */ +@MicronautTest +public class ModelApiResponseSpec extends Specification { + private final ModelApiResponse model = new ModelApiResponse() + + /** + * Model tests for ModelApiResponse + */ + void "ModelApiResponse test"() { + // TODO: test ModelApiResponse + } + + /** + * Test the property 'code' + */ + void "ModelApiResponse property code test"() { + // TODO: test code + } + + /** + * Test the property 'type' + */ + void "ModelApiResponse property type test"() { + // TODO: test type + } + + /** + * Test the property 'message' + */ + void "ModelApiResponse property message test"() { + // TODO: test message + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelClientSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelClientSpec.groovy new file mode 100644 index 00000000000..15de84e16e1 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelClientSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ModelClient + */ +@MicronautTest +public class ModelClientSpec extends Specification { + private final ModelClient model = new ModelClient() + + /** + * Model tests for ModelClient + */ + void "ModelClient test"() { + // TODO: test ModelClient + } + + /** + * Test the property '_client' + */ + void "ModelClient property _client test"() { + // TODO: test _client + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelReturnSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelReturnSpec.groovy new file mode 100644 index 00000000000..ec9ff8427f8 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ModelReturnSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ModelReturn + */ +@MicronautTest +public class ModelReturnSpec extends Specification { + private final ModelReturn model = new ModelReturn() + + /** + * Model tests for ModelReturn + */ + void "ModelReturn test"() { + // TODO: test ModelReturn + } + + /** + * Test the property '_return' + */ + void "ModelReturn property _return test"() { + // TODO: test _return + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NameSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NameSpec.groovy new file mode 100644 index 00000000000..af3bcb6f545 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NameSpec.groovy @@ -0,0 +1,51 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Name + */ +@MicronautTest +public class NameSpec extends Specification { + private final Name model = new Name() + + /** + * Model tests for Name + */ + void "Name test"() { + // TODO: test Name + } + + /** + * Test the property 'name' + */ + void "Name property name test"() { + // TODO: test name + } + + /** + * Test the property 'snakeCase' + */ + void "Name property snakeCase test"() { + // TODO: test snakeCase + } + + /** + * Test the property 'property' + */ + void "Name property property test"() { + // TODO: test property + } + + /** + * Test the property '_123number' + */ + void "Name property _123number test"() { + // TODO: test _123number + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NumberOnlySpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NumberOnlySpec.groovy new file mode 100644 index 00000000000..19abee7e60f --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/NumberOnlySpec.groovy @@ -0,0 +1,31 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for NumberOnly + */ +@MicronautTest +public class NumberOnlySpec extends Specification { + private final NumberOnly model = new NumberOnly() + + /** + * Model tests for NumberOnly + */ + void "NumberOnly test"() { + // TODO: test NumberOnly + } + + /** + * Test the property 'justNumber' + */ + void "NumberOnly property justNumber test"() { + // TODO: test justNumber + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OrderSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OrderSpec.groovy new file mode 100644 index 00000000000..c4421f8c243 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OrderSpec.groovy @@ -0,0 +1,66 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.time.LocalDateTime +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Order + */ +@MicronautTest +public class OrderSpec extends Specification { + private final Order model = new Order() + + /** + * Model tests for Order + */ + void "Order test"() { + // TODO: test Order + } + + /** + * Test the property 'id' + */ + void "Order property id test"() { + // TODO: test id + } + + /** + * Test the property 'petId' + */ + void "Order property petId test"() { + // TODO: test petId + } + + /** + * Test the property 'quantity' + */ + void "Order property quantity test"() { + // TODO: test quantity + } + + /** + * Test the property 'shipDate' + */ + void "Order property shipDate test"() { + // TODO: test shipDate + } + + /** + * Test the property 'status' + */ + void "Order property status test"() { + // TODO: test status + } + + /** + * Test the property 'complete' + */ + void "Order property complete test"() { + // TODO: test complete + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterCompositeSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterCompositeSpec.groovy new file mode 100644 index 00000000000..db5caf95e62 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterCompositeSpec.groovy @@ -0,0 +1,45 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for OuterComposite + */ +@MicronautTest +public class OuterCompositeSpec extends Specification { + private final OuterComposite model = new OuterComposite() + + /** + * Model tests for OuterComposite + */ + void "OuterComposite test"() { + // TODO: test OuterComposite + } + + /** + * Test the property 'myNumber' + */ + void "OuterComposite property myNumber test"() { + // TODO: test myNumber + } + + /** + * Test the property 'myString' + */ + void "OuterComposite property myString test"() { + // TODO: test myString + } + + /** + * Test the property 'myBoolean' + */ + void "OuterComposite property myBoolean test"() { + // TODO: test myBoolean + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterEnumSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterEnumSpec.groovy new file mode 100644 index 00000000000..abfdae04e77 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/OuterEnumSpec.groovy @@ -0,0 +1,19 @@ +package org.openapitools.model + +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for OuterEnum + */ +@MicronautTest +public class OuterEnumSpec extends Specification { + /** + * Model tests for OuterEnum + */ + void "OuterEnum test"() { + // TODO: test OuterEnum + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/PetSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/PetSpec.groovy new file mode 100644 index 00000000000..dd72edcc319 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/PetSpec.groovy @@ -0,0 +1,71 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.util.ArrayList +import java.util.LinkedHashSet +import java.util.List +import java.util.Set +import org.openapitools.model.Category +import org.openapitools.model.Tag +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Pet + */ +@MicronautTest +public class PetSpec extends Specification { + private final Pet model = new Pet() + + /** + * Model tests for Pet + */ + void "Pet test"() { + // TODO: test Pet + } + + /** + * Test the property 'id' + */ + void "Pet property id test"() { + // TODO: test id + } + + /** + * Test the property 'category' + */ + void "Pet property category test"() { + // TODO: test category + } + + /** + * Test the property 'name' + */ + void "Pet property name test"() { + // TODO: test name + } + + /** + * Test the property 'photoUrls' + */ + void "Pet property photoUrls test"() { + // TODO: test photoUrls + } + + /** + * Test the property 'tags' + */ + void "Pet property tags test"() { + // TODO: test tags + } + + /** + * Test the property 'status' + */ + void "Pet property status test"() { + // TODO: test status + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ReadOnlyFirstSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ReadOnlyFirstSpec.groovy new file mode 100644 index 00000000000..b16cba13912 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ReadOnlyFirstSpec.groovy @@ -0,0 +1,37 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for ReadOnlyFirst + */ +@MicronautTest +public class ReadOnlyFirstSpec extends Specification { + private final ReadOnlyFirst model = new ReadOnlyFirst() + + /** + * Model tests for ReadOnlyFirst + */ + void "ReadOnlyFirst test"() { + // TODO: test ReadOnlyFirst + } + + /** + * Test the property 'bar' + */ + void "ReadOnlyFirst property bar test"() { + // TODO: test bar + } + + /** + * Test the property 'baz' + */ + void "ReadOnlyFirst property baz test"() { + // TODO: test baz + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/SpecialModelNameSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/SpecialModelNameSpec.groovy new file mode 100644 index 00000000000..8466e6415e2 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/SpecialModelNameSpec.groovy @@ -0,0 +1,30 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for SpecialModelName + */ +@MicronautTest +public class SpecialModelNameSpec extends Specification { + private final SpecialModelName model = new SpecialModelName() + + /** + * Model tests for SpecialModelName + */ + void "SpecialModelName test"() { + // TODO: test SpecialModelName + } + + /** + * Test the property '$specialPropertyName' + */ + void 'SpecialModelName property $specialPropertyName test'() { + // TODO: test $specialPropertyName + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TagSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TagSpec.groovy new file mode 100644 index 00000000000..15f2f00fcbf --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TagSpec.groovy @@ -0,0 +1,37 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for Tag + */ +@MicronautTest +public class TagSpec extends Specification { + private final Tag model = new Tag() + + /** + * Model tests for Tag + */ + void "Tag test"() { + // TODO: test Tag + } + + /** + * Test the property 'id' + */ + void "Tag property id test"() { + // TODO: test id + } + + /** + * Test the property 'name' + */ + void "Tag property name test"() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderDefaultSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderDefaultSpec.groovy new file mode 100644 index 00000000000..20ef71c2c61 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderDefaultSpec.groovy @@ -0,0 +1,61 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for TypeHolderDefault + */ +@MicronautTest +public class TypeHolderDefaultSpec extends Specification { + private final TypeHolderDefault model = new TypeHolderDefault() + + /** + * Model tests for TypeHolderDefault + */ + void "TypeHolderDefault test"() { + // TODO: test TypeHolderDefault + } + + /** + * Test the property 'stringItem' + */ + void "TypeHolderDefault property stringItem test"() { + // TODO: test stringItem + } + + /** + * Test the property 'numberItem' + */ + void "TypeHolderDefault property numberItem test"() { + // TODO: test numberItem + } + + /** + * Test the property 'integerItem' + */ + void "TypeHolderDefault property integerItem test"() { + // TODO: test integerItem + } + + /** + * Test the property 'boolItem' + */ + void "TypeHolderDefault property boolItem test"() { + // TODO: test boolItem + } + + /** + * Test the property 'arrayItem' + */ + void "TypeHolderDefault property arrayItem test"() { + // TODO: test arrayItem + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderExampleSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderExampleSpec.groovy new file mode 100644 index 00000000000..29577de7621 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/TypeHolderExampleSpec.groovy @@ -0,0 +1,68 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for TypeHolderExample + */ +@MicronautTest +public class TypeHolderExampleSpec extends Specification { + private final TypeHolderExample model = new TypeHolderExample() + + /** + * Model tests for TypeHolderExample + */ + void "TypeHolderExample test"() { + // TODO: test TypeHolderExample + } + + /** + * Test the property 'stringItem' + */ + void "TypeHolderExample property stringItem test"() { + // TODO: test stringItem + } + + /** + * Test the property 'numberItem' + */ + void "TypeHolderExample property numberItem test"() { + // TODO: test numberItem + } + + /** + * Test the property 'floatItem' + */ + void "TypeHolderExample property floatItem test"() { + // TODO: test floatItem + } + + /** + * Test the property 'integerItem' + */ + void "TypeHolderExample property integerItem test"() { + // TODO: test integerItem + } + + /** + * Test the property 'boolItem' + */ + void "TypeHolderExample property boolItem test"() { + // TODO: test boolItem + } + + /** + * Test the property 'arrayItem' + */ + void "TypeHolderExample property arrayItem test"() { + // TODO: test arrayItem + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/UserSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/UserSpec.groovy new file mode 100644 index 00000000000..af7ec2738c3 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/UserSpec.groovy @@ -0,0 +1,79 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for User + */ +@MicronautTest +public class UserSpec extends Specification { + private final User model = new User() + + /** + * Model tests for User + */ + void "User test"() { + // TODO: test User + } + + /** + * Test the property 'id' + */ + void "User property id test"() { + // TODO: test id + } + + /** + * Test the property 'username' + */ + void "User property username test"() { + // TODO: test username + } + + /** + * Test the property 'firstName' + */ + void "User property firstName test"() { + // TODO: test firstName + } + + /** + * Test the property 'lastName' + */ + void "User property lastName test"() { + // TODO: test lastName + } + + /** + * Test the property 'email' + */ + void "User property email test"() { + // TODO: test email + } + + /** + * Test the property 'password' + */ + void "User property password test"() { + // TODO: test password + } + + /** + * Test the property 'phone' + */ + void "User property phone test"() { + // TODO: test phone + } + + /** + * Test the property 'userStatus' + */ + void "User property userStatus test"() { + // TODO: test userStatus + } + +} diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/XmlItemSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/XmlItemSpec.groovy new file mode 100644 index 00000000000..02d57582c68 --- /dev/null +++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/XmlItemSpec.groovy @@ -0,0 +1,229 @@ +package org.openapitools.model + +import io.swagger.annotations.ApiModel +import io.swagger.annotations.ApiModelProperty +import java.math.BigDecimal +import java.util.ArrayList +import java.util.List +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +/** + * Model tests for XmlItem + */ +@MicronautTest +public class XmlItemSpec extends Specification { + private final XmlItem model = new XmlItem() + + /** + * Model tests for XmlItem + */ + void "XmlItem test"() { + // TODO: test XmlItem + } + + /** + * Test the property 'attributeString' + */ + void "XmlItem property attributeString test"() { + // TODO: test attributeString + } + + /** + * Test the property 'attributeNumber' + */ + void "XmlItem property attributeNumber test"() { + // TODO: test attributeNumber + } + + /** + * Test the property 'attributeInteger' + */ + void "XmlItem property attributeInteger test"() { + // TODO: test attributeInteger + } + + /** + * Test the property 'attributeBoolean' + */ + void "XmlItem property attributeBoolean test"() { + // TODO: test attributeBoolean + } + + /** + * Test the property 'wrappedArray' + */ + void "XmlItem property wrappedArray test"() { + // TODO: test wrappedArray + } + + /** + * Test the property 'nameString' + */ + void "XmlItem property nameString test"() { + // TODO: test nameString + } + + /** + * Test the property 'nameNumber' + */ + void "XmlItem property nameNumber test"() { + // TODO: test nameNumber + } + + /** + * Test the property 'nameInteger' + */ + void "XmlItem property nameInteger test"() { + // TODO: test nameInteger + } + + /** + * Test the property 'nameBoolean' + */ + void "XmlItem property nameBoolean test"() { + // TODO: test nameBoolean + } + + /** + * Test the property 'nameArray' + */ + void "XmlItem property nameArray test"() { + // TODO: test nameArray + } + + /** + * Test the property 'nameWrappedArray' + */ + void "XmlItem property nameWrappedArray test"() { + // TODO: test nameWrappedArray + } + + /** + * Test the property 'prefixString' + */ + void "XmlItem property prefixString test"() { + // TODO: test prefixString + } + + /** + * Test the property 'prefixNumber' + */ + void "XmlItem property prefixNumber test"() { + // TODO: test prefixNumber + } + + /** + * Test the property 'prefixInteger' + */ + void "XmlItem property prefixInteger test"() { + // TODO: test prefixInteger + } + + /** + * Test the property 'prefixBoolean' + */ + void "XmlItem property prefixBoolean test"() { + // TODO: test prefixBoolean + } + + /** + * Test the property 'prefixArray' + */ + void "XmlItem property prefixArray test"() { + // TODO: test prefixArray + } + + /** + * Test the property 'prefixWrappedArray' + */ + void "XmlItem property prefixWrappedArray test"() { + // TODO: test prefixWrappedArray + } + + /** + * Test the property 'namespaceString' + */ + void "XmlItem property namespaceString test"() { + // TODO: test namespaceString + } + + /** + * Test the property 'namespaceNumber' + */ + void "XmlItem property namespaceNumber test"() { + // TODO: test namespaceNumber + } + + /** + * Test the property 'namespaceInteger' + */ + void "XmlItem property namespaceInteger test"() { + // TODO: test namespaceInteger + } + + /** + * Test the property 'namespaceBoolean' + */ + void "XmlItem property namespaceBoolean test"() { + // TODO: test namespaceBoolean + } + + /** + * Test the property 'namespaceArray' + */ + void "XmlItem property namespaceArray test"() { + // TODO: test namespaceArray + } + + /** + * Test the property 'namespaceWrappedArray' + */ + void "XmlItem property namespaceWrappedArray test"() { + // TODO: test namespaceWrappedArray + } + + /** + * Test the property 'prefixNsString' + */ + void "XmlItem property prefixNsString test"() { + // TODO: test prefixNsString + } + + /** + * Test the property 'prefixNsNumber' + */ + void "XmlItem property prefixNsNumber test"() { + // TODO: test prefixNsNumber + } + + /** + * Test the property 'prefixNsInteger' + */ + void "XmlItem property prefixNsInteger test"() { + // TODO: test prefixNsInteger + } + + /** + * Test the property 'prefixNsBoolean' + */ + void "XmlItem property prefixNsBoolean test"() { + // TODO: test prefixNsBoolean + } + + /** + * Test the property 'prefixNsArray' + */ + void "XmlItem property prefixNsArray test"() { + // TODO: test prefixNsArray + } + + /** + * Test the property 'prefixNsWrappedArray' + */ + void "XmlItem property prefixNsWrappedArray test"() { + // TODO: test prefixNsWrappedArray + } + +} From 23fdd1b7d8a0249ed17fbb03733c8b856a4f0c28 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 15 Aug 2021 22:41:42 +0800 Subject: [PATCH 65/72] update samples --- .../petstore/java-micronaut-client/.openapi-generator/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION index 6555596f931..862529f8cac 100644 --- a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.0-SNAPSHOT \ No newline at end of file +5.2.1-SNAPSHOT \ No newline at end of file From 74671fa242da78f1e5ec2c31791510d97642fb94 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 15 Aug 2021 23:02:36 +0800 Subject: [PATCH 66/72] update doc --- docs/generators.md | 1 + docs/generators/php-dt.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/generators.md b/docs/generators.md index ae2927f6dce..f78e0c90fc0 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -45,6 +45,7 @@ The following generators are available: * [k6 (beta)](generators/k6.md) * [kotlin](generators/kotlin.md) * [lua (beta)](generators/lua.md) +* [micronaut-client](generators/micronaut-client.md) * [nim (beta)](generators/nim.md) * [objc](generators/objc.md) * [ocaml](generators/ocaml.md) diff --git a/docs/generators/php-dt.md b/docs/generators/php-dt.md index 0ce4ccd3deb..a61f3cd351c 100644 --- a/docs/generators/php-dt.md +++ b/docs/generators/php-dt.md @@ -41,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
                        • DateTime
                          • +
                        • array
                        • bool
                        • boolean
                        • byte
                          • From 87554ecb2d3506082d53d1283e7d565fb06fd694 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 16 Aug 2021 12:04:42 +0800 Subject: [PATCH 67/72] [java][micronaut] minor improvements (#10158) * mark java micronaut generator as beta * update doc --- bin/configs/java-micronaut-client.yaml | 2 +- docs/generators.md | 2 +- ...aut-client.md => java-micronaut-client.md} | 4 +-- .../languages/JavaMicronautClientCodegen.java | 26 ++++++++++++++----- 4 files changed, 23 insertions(+), 11 deletions(-) rename docs/generators/{micronaut-client.md => java-micronaut-client.md} (99%) diff --git a/bin/configs/java-micronaut-client.yaml b/bin/configs/java-micronaut-client.yaml index 35a356d8756..31722943924 100644 --- a/bin/configs/java-micronaut-client.yaml +++ b/bin/configs/java-micronaut-client.yaml @@ -1,4 +1,4 @@ -generatorName: micronaut-client +generatorName: java-micronaut-client outputDir: samples/client/petstore/java-micronaut-client/ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml additionalProperties: diff --git a/docs/generators.md b/docs/generators.md index f78e0c90fc0..156a339c4e1 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -36,6 +36,7 @@ The following generators are available: * [groovy](generators/groovy.md) * [haskell-http-client](generators/haskell-http-client.md) * [java](generators/java.md) +* [java-micronaut-client (beta)](generators/java-micronaut-client.md) * [javascript](generators/javascript.md) * [javascript-apollo (beta)](generators/javascript-apollo.md) * [javascript-closure-angular](generators/javascript-closure-angular.md) @@ -45,7 +46,6 @@ The following generators are available: * [k6 (beta)](generators/k6.md) * [kotlin](generators/kotlin.md) * [lua (beta)](generators/lua.md) -* [micronaut-client](generators/micronaut-client.md) * [nim (beta)](generators/nim.md) * [objc](generators/objc.md) * [ocaml](generators/ocaml.md) diff --git a/docs/generators/micronaut-client.md b/docs/generators/java-micronaut-client.md similarity index 99% rename from docs/generators/micronaut-client.md rename to docs/generators/java-micronaut-client.md index 14a2292f04a..ab0333b9bf1 100644 --- a/docs/generators/micronaut-client.md +++ b/docs/generators/java-micronaut-client.md @@ -1,6 +1,6 @@ --- -title: Config Options for micronaut-client -sidebar_label: micronaut-client +title: Config Options for java-micronaut-client +sidebar_label: java-micronaut-client --- These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java index 047607d4903..df5073d8d92 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java @@ -1,12 +1,20 @@ package org.openapitools.codegen.languages; -import org.openapitools.codegen.*; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.languages.features.BeanValidationFeatures; +import org.openapitools.codegen.meta.GeneratorMetadata; +import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.SecurityFeature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; + +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE; @@ -26,7 +34,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B public static final String OPT_TEST_JUNIT = "junit"; public static final String OPT_TEST_SPOCK = "spock"; - public static final String NAME = "micronaut-client"; + public static final String NAME = "java-micronaut-client"; protected String title; protected String configPackage; @@ -61,7 +69,11 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B )) ); - outputFolder = "generated-code/javaMicronaut"; + generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) + .stability(Stability.BETA) + .build(); + + outputFolder = "generated-code/java-micronaut-client"; embeddedTemplateDir = templateDir = "java-micronaut-client"; apiPackage = "org.openapitools.api"; modelPackage = "org.openapitools.model"; @@ -85,7 +97,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation)); CliOption buildToolOption = new CliOption(OPT_BUILD, "Specify for which build tool to generate files").defaultValue(buildTool); - buildToolOption.setEnum(new HashMap(){{ + buildToolOption.setEnum(new HashMap() {{ put(OPT_BUILD_GRADLE, "Gradle configuration is generated for the project"); put(OPT_BUILD_MAVEN, "Maven configuration is generated for the project"); put(OPT_BUILD_ALL, "Both Gradle and Maven configurations are generated"); @@ -93,7 +105,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B cliOptions.add(buildToolOption); CliOption testToolOption = new CliOption(OPT_TEST, "Specify which test tool to generate files for").defaultValue(testTool); - testToolOption.setEnum(new HashMap(){{ + testToolOption.setEnum(new HashMap() {{ put(OPT_TEST_JUNIT, "Use JUnit as test tool"); put(OPT_TEST_SPOCK, "Use Spock as test tool"); }}); @@ -173,7 +185,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B additionalProperties.put(OPT_BUILD, buildTool); if (additionalProperties.containsKey(OPT_TEST)) { - switch((String) additionalProperties.get(OPT_TEST)) { + switch ((String) additionalProperties.get(OPT_TEST)) { case OPT_TEST_JUNIT: case OPT_TEST_SPOCK: this.testTool = (String) additionalProperties.get(OPT_TEST); From 8eb31d0c7cbc5ffd6b9fc6df4add9509b57f1cf3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 16 Aug 2021 12:05:02 +0800 Subject: [PATCH 68/72] minor improvements to php-dt generator (#10159) --- docs/generators.md | 3 ++- .../PhpDataTransferClientCodegen.java | 21 +++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/docs/generators.md b/docs/generators.md index 156a339c4e1..5406b6746cf 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -46,12 +46,13 @@ The following generators are available: * [k6 (beta)](generators/k6.md) * [kotlin](generators/kotlin.md) * [lua (beta)](generators/lua.md) +* [micronaut-client](generators/micronaut-client.md) * [nim (beta)](generators/nim.md) * [objc](generators/objc.md) * [ocaml](generators/ocaml.md) * [perl](generators/perl.md) * [php](generators/php.md) -* [php-dt](generators/php-dt.md) +* [php-dt (beta)](generators/php-dt.md) * [powershell (beta)](generators/powershell.md) * [python (experimental)](generators/python.md) * [python-legacy](generators/python-legacy.md) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java index e85f3b67da4..38fc3332ee1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java @@ -27,7 +27,12 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; -import org.openapitools.codegen.*; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenOperation; +import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.SupportingFile; +import org.openapitools.codegen.meta.GeneratorMetadata; +import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; @@ -63,7 +68,7 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { @Override public String getHelp() { - return "Generates PHP client relying on Data Transfer ( https://github.com/Articus/DataTransfer ) and compliant with PSR-7, PSR-11, PSR-17 and PSR-18."; + return "Generates a PHP client relying on Data Transfer ( https://github.com/Articus/DataTransfer ) and compliant with PSR-7, PSR-11, PSR-17 and PSR-18."; } public PhpDataTransferClientCodegen() { @@ -83,6 +88,10 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { ) ); + generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) + .stability(Stability.BETA) + .build(); + //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"); @@ -359,7 +368,7 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { * Generate additional model definitions for containers in specified schema * * @param openAPI OpenAPI object - * @param schema OAS schema to process + * @param schema OAS schema to process */ protected void generateContainerSchemas(OpenAPI openAPI, Schema schema) { if (schema != null) { @@ -371,7 +380,7 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { //Recursively process all schemas of object properties Map properties = schema.getProperties(); if (properties != null) { - for (String propertyName: properties.keySet()) { + for (String propertyName : properties.keySet()) { generateContainerSchemas(openAPI, properties.get(propertyName)); } } @@ -415,7 +424,7 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { PathItem path = paths.get(pathname); List operations = path.readOperations(); if (operations != null) { - for (Operation operation: operations) { + for (Operation operation : operations) { RequestBody requestBody = ModelUtils.getReferencedRequestBody(openAPI, operation.getRequestBody()); if (requestBody != null) { requestBody.setContent(copyWithQuotedMediaTypes(requestBody.getContent())); @@ -435,7 +444,7 @@ public class PhpDataTransferClientCodegen extends AbstractPhpCodegen { Content result = null; if (content != null) { result = new Content(); - for (String mediaType: content.keySet()) { + for (String mediaType : content.keySet()) { result.addMediaType("'" + mediaType + "'", content.get(mediaType)); } } From 849fec29b0a2f9e60be2b95098269f4b59c3d033 Mon Sep 17 00:00:00 2001 From: Vikrant Balyan Date: Mon, 16 Aug 2021 09:41:04 +0530 Subject: [PATCH 69/72] [CSharp-Netcore][Go] Optimize time taken to generate CSharp code (#10152) * adds memoization to speed up csharp code generation * takes care of review comments * memoize adds to toModel for Go generator as well Co-authored-by: Aanisha Mishra --- .../org/openapitools/codegen/DefaultCodegen.java | 11 ++++++++++- .../codegen/languages/AbstractCSharpCodegen.java | 15 ++++++++++++++- .../codegen/languages/GoClientCodegen.java | 11 ++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) 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 fc98a969d14..4d0b35007fa 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 @@ -256,6 +256,9 @@ public class DefaultCodegen implements CodegenConfig { // A cache to efficiently lookup a Schema instance based on the return value of `toModelName()`. private Map modelNameToSchemaCache; + // A cache to efficiently lookup schema `toModelName()` based on the schema Key + private Map schemaKeyToModelNameCache = new HashMap<>(); + @Override public List cliOptions() { return cliOptions; @@ -2322,7 +2325,13 @@ public class DefaultCodegen implements CodegenConfig { */ @Override public String toModelName(final String name) { - return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix); + if (schemaKeyToModelNameCache.containsKey(name)) { + return schemaKeyToModelNameCache.get(name); + } + + String camelizedName = camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix); + schemaKeyToModelNameCache.put(name, camelizedName); + return camelizedName; } private static class NamedSchema { 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 fa09150e555..7093997f0b9 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 @@ -90,6 +90,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // special property keywords not allowed as these are the function names in the model files protected Set propertySpecialKeywords = new HashSet<>(Arrays.asList("ToString", "ToJson", "GetHashCode", "Equals", "ShouldSerializeToString")); + // A cache to efficiently lookup schema `toModelName()` based on the schema Key + private Map schemaKeyToModelNameCache = new HashMap<>(); + public AbstractCSharpCodegen() { super(); @@ -1035,6 +1038,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co if (importMapping.containsKey(name)) { return importMapping.get(name); } + + // memoization + String origName = name; + if (schemaKeyToModelNameCache.containsKey(origName)) { + return schemaKeyToModelNameCache.get(origName); + } + if (!StringUtils.isEmpty(modelNamePrefix)) { name = modelNamePrefix + "_" + name; } @@ -1058,9 +1068,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co name = "model_" + name; // e.g. 200Response => Model200Response (after camelize) } + String camelizedName = camelize(name); + schemaKeyToModelNameCache.put(origName, camelizedName); + // camelize the model name // phone_number => PhoneNumber - return camelize(name); + return camelizedName; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java index 11861b57924..60c0d9117db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java @@ -49,6 +49,9 @@ public class GoClientCodegen extends AbstractGoCodegen { protected boolean isGoSubmodule = false; protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + // A cache to efficiently lookup schema `toModelName()` based on the schema Key + private Map schemaKeyToModelNameCache = new HashMap<>(); + public GoClientCodegen() { super(); @@ -312,8 +315,14 @@ public class GoClientCodegen extends AbstractGoCodegen { @Override public String toModelName(String name) { + if (schemaKeyToModelNameCache.containsKey(name)) { + return schemaKeyToModelNameCache.get(name); + } + // underscoring would also lowercase the whole name, thus losing acronyms which are in capitals - return camelize(toModel(name, false)); + String camelizedName = camelize(toModel(name, false)); + schemaKeyToModelNameCache.put(name, camelizedName); + return camelizedName; } public String escapeReservedWord(String name) { From 2d8ee321742632bba1252a412555bf31b5b0ec11 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 16 Aug 2021 17:28:16 +0800 Subject: [PATCH 70/72] skip php client tests due to newer version required --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e91c087a86..3d9c301854b 100644 --- a/pom.xml +++ b/pom.xml @@ -1218,7 +1218,8 @@ samples/client/petstore/rust samples/client/petstore/rust/reqwest/petstore samples/client/petstore/rust/reqwest/petstore-async - samples/client/petstore/php/OpenAPIClient-php + samples/client/petstore/javascript-flowtyped samples/client/petstore/python From 8403e59aa03d0099b7c6872b9b884a3d83d05b9a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 16 Aug 2021 19:08:29 +0800 Subject: [PATCH 71/72] Prepare 5.2.1 release (#10161) * prepare for 5.2.1 release * update samples --- docs/generators.md | 1 - modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- modules/openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- modules/openapi-generator-maven-plugin/examples/java-client.xml | 2 +- .../examples/multi-module/java-client/pom.xml | 2 +- .../examples/non-java-invalid-spec.xml | 2 +- modules/openapi-generator-maven-plugin/examples/non-java.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- samples/client/petstore/R/.openapi-generator/VERSION | 2 +- samples/client/petstore/apex/.openapi-generator/VERSION | 2 +- samples/client/petstore/bash/.openapi-generator/VERSION | 2 +- samples/client/petstore/c/.openapi-generator/VERSION | 2 +- samples/client/petstore/cpp-qt/.openapi-generator/VERSION | 2 +- .../petstore/cpp-restsdk/client/.openapi-generator/VERSION | 2 +- samples/client/petstore/cpp-restsdk/client/ApiClient.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/ApiClient.h | 2 +- samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h | 2 +- samples/client/petstore/cpp-restsdk/client/ApiException.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/ApiException.h | 2 +- samples/client/petstore/cpp-restsdk/client/HttpContent.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/HttpContent.h | 2 +- samples/client/petstore/cpp-restsdk/client/IHttpBody.h | 2 +- samples/client/petstore/cpp-restsdk/client/JsonBody.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/JsonBody.h | 2 +- samples/client/petstore/cpp-restsdk/client/ModelBase.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/ModelBase.h | 2 +- .../client/petstore/cpp-restsdk/client/MultipartFormData.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/MultipartFormData.h | 2 +- samples/client/petstore/cpp-restsdk/client/Object.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/Object.h | 2 +- samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/api/PetApi.h | 2 +- samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/api/StoreApi.h | 2 +- samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/api/UserApi.h | 2 +- .../client/petstore/cpp-restsdk/client/model/ApiResponse.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h | 2 +- samples/client/petstore/cpp-restsdk/client/model/Category.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/Category.h | 2 +- samples/client/petstore/cpp-restsdk/client/model/Order.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/Order.h | 2 +- samples/client/petstore/cpp-restsdk/client/model/Pet.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/Pet.h | 2 +- samples/client/petstore/cpp-restsdk/client/model/Tag.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/Tag.h | 2 +- samples/client/petstore/cpp-restsdk/client/model/User.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/model/User.h | 2 +- samples/client/petstore/cpp-tiny/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.travis.yml | 2 +- samples/client/petstore/crystal/spec/spec_helper.cr | 2 +- samples/client/petstore/crystal/src/petstore.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/pet_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/store_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/user_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api_client.cr | 2 +- samples/client/petstore/crystal/src/petstore/api_error.cr | 2 +- samples/client/petstore/crystal/src/petstore/configuration.cr | 2 +- .../client/petstore/crystal/src/petstore/models/api_response.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/category.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/order.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/pet.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/tag.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/user.cr | 2 +- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient-httpclient/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-net47/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-net5.0/.openapi-generator/VERSION | 2 +- .../csharp-netcore/OpenAPIClient/.openapi-generator/VERSION | 2 +- .../csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION | 2 +- .../OpenAPIClientCoreAndNet47/.openapi-generator/VERSION | 2 +- .../petstore/csharp/OpenAPIClient/.openapi-generator/VERSION | 2 +- samples/client/petstore/elixir/.openapi-generator/VERSION | 2 +- .../client/petstore/go/go-petstore/.openapi-generator/VERSION | 2 +- samples/client/petstore/groovy/.openapi-generator/VERSION | 2 +- .../petstore/haskell-http-client/.openapi-generator/VERSION | 2 +- .../petstore/java-micronaut-client/.openapi-generator/VERSION | 2 +- .../petstore/java/feign-no-nullable/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/feign/.openapi-generator/VERSION | 2 +- .../petstore/java/google-api-client/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/jersey1/.openapi-generator/VERSION | 2 +- .../java/jersey2-java8-localdatetime/.openapi-generator/VERSION | 2 +- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 2 +- .../java/microprofile-rest-client/.openapi-generator/VERSION | 2 +- .../petstore/java/native-async/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/native/.openapi-generator/VERSION | 2 +- .../okhttp-gson-dynamicOperations/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-parcelableModel/.openapi-generator/VERSION | 2 +- .../client/petstore/java/okhttp-gson/.openapi-generator/VERSION | 2 +- .../java/rest-assured-jackson/.openapi-generator/VERSION | 2 +- .../petstore/java/rest-assured/.openapi-generator/VERSION | 2 +- .../client/petstore/java/resteasy/.openapi-generator/VERSION | 2 +- .../java/resttemplate-withXml/.openapi-generator/VERSION | 2 +- .../petstore/java/resttemplate/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2-play26/.openapi-generator/VERSION | 2 +- .../client/petstore/java/retrofit2/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2rx2/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2rx3/.openapi-generator/VERSION | 2 +- .../petstore/java/vertx-no-nullable/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/vertx/.openapi-generator/VERSION | 2 +- .../java/webclient-nulable-arrays/.openapi-generator/VERSION | 2 +- .../client/petstore/java/webclient/.openapi-generator/VERSION | 2 +- .../client/petstore/javascript-es6/.openapi-generator/VERSION | 2 +- .../petstore/javascript-promise-es6/.openapi-generator/VERSION | 2 +- samples/client/petstore/kotlin-gson/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-jackson/.openapi-generator/VERSION | 2 +- .../kotlin-json-request-string/.openapi-generator/VERSION | 2 +- .../kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-moshi-codegen/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-multiplatform/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-nonpublic/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-nullable/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-okhttp3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-retrofit2/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-string/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-threetenbp/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-uppercase-enum/.openapi-generator/VERSION | 2 +- samples/client/petstore/kotlin/.openapi-generator/VERSION | 2 +- samples/client/petstore/lua/.openapi-generator/VERSION | 2 +- samples/client/petstore/nim/.openapi-generator/VERSION | 2 +- .../client/petstore/objc/core-data/.openapi-generator/VERSION | 2 +- samples/client/petstore/objc/default/.openapi-generator/VERSION | 2 +- samples/client/petstore/perl/.openapi-generator/VERSION | 2 +- .../client/petstore/php-dt-modern/.openapi-generator/VERSION | 2 +- samples/client/petstore/php-dt/.openapi-generator/VERSION | 2 +- .../petstore/php/OpenAPIClient-php/.openapi-generator/VERSION | 2 +- .../petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/ApiException.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Configuration.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/HeaderSelector.php | 2 +- .../OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php | 2 +- .../OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php | 2 +- .../php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/Category.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Client.php | 2 +- .../php/OpenAPIClient-php/lib/Model/DeprecatedObject.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/File.php | 2 +- .../php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php | 2 +- .../php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php | 2 +- .../php/OpenAPIClient-php/lib/Model/HealthCheckResult.php | 2 +- .../php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php | 2 +- .../lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Model200Response.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelList.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Name.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php | 2 +- .../OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Order.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php | 2 +- .../php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php | 2 +- .../php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php | 2 +- .../lib/Model/OuterEnumIntegerDefaultValue.php | 2 +- .../OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php | 2 +- .../php/OpenAPIClient-php/lib/Model/SpecialModelName.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/User.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php | 2 +- samples/client/petstore/powershell/.openapi-generator/VERSION | 2 +- .../client/petstore/python-asyncio/.openapi-generator/VERSION | 2 +- .../client/petstore/python-legacy/.openapi-generator/VERSION | 2 +- .../client/petstore/python-tornado/.openapi-generator/VERSION | 2 +- samples/client/petstore/python/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby-faraday/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby-faraday/lib/petstore.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/api/default_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/store_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/user_api.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/configuration.rb | 2 +- .../lib/petstore/models/additional_properties_class.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/animal.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/api_response.rb | 2 +- .../lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../ruby-faraday/lib/petstore/models/array_of_number_only.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/array_test.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/capitalization.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/category.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/class_model.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/client.rb | 2 +- .../ruby-faraday/lib/petstore/models/deprecated_object.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_class.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_test.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/file.rb | 2 +- .../ruby-faraday/lib/petstore/models/file_schema_test_class.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/format_test.rb | 2 +- .../ruby-faraday/lib/petstore/models/has_only_read_only.rb | 2 +- .../ruby-faraday/lib/petstore/models/health_check_result.rb | 2 +- .../ruby-faraday/lib/petstore/models/inline_response_default.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/list.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/map_test.rb | 2 +- .../models/mixed_properties_and_additional_properties_class.rb | 2 +- .../ruby-faraday/lib/petstore/models/model200_response.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/model_return.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/name.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/nullable_class.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/number_only.rb | 2 +- .../lib/petstore/models/object_with_deprecated_fields.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/order.rb | 2 +- .../ruby-faraday/lib/petstore/models/outer_composite.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/outer_enum.rb | 2 +- .../lib/petstore/models/outer_enum_default_value.rb | 2 +- .../ruby-faraday/lib/petstore/models/outer_enum_integer.rb | 2 +- .../lib/petstore/models/outer_enum_integer_default_value.rb | 2 +- .../lib/petstore/models/outer_object_with_enum_property.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb | 2 +- .../ruby-faraday/lib/petstore/models/read_only_first.rb | 2 +- .../ruby-faraday/lib/petstore/models/special_model_name.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/user.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby-faraday/petstore.gemspec | 2 +- samples/client/petstore/ruby-faraday/spec/api_client_spec.rb | 2 +- samples/client/petstore/ruby-faraday/spec/configuration_spec.rb | 2 +- samples/client/petstore/ruby-faraday/spec/spec_helper.rb | 2 +- samples/client/petstore/ruby/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby/lib/petstore.rb | 2 +- .../client/petstore/ruby/lib/petstore/api/another_fake_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/default_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 2 +- .../ruby/lib/petstore/api/fake_classname_tags123_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/pet_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/store_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/user_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api_client.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api_error.rb | 2 +- samples/client/petstore/ruby/lib/petstore/configuration.rb | 2 +- .../ruby/lib/petstore/models/additional_properties_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/animal.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/api_response.rb | 2 +- .../ruby/lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/array_of_number_only.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/array_test.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/capitalization.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/cat.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/category.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/class_model.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/client.rb | 2 +- .../petstore/ruby/lib/petstore/models/deprecated_object.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/dog.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_test.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/file.rb | 2 +- .../petstore/ruby/lib/petstore/models/file_schema_test_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/foo.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/format_test.rb | 2 +- .../petstore/ruby/lib/petstore/models/has_only_read_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/health_check_result.rb | 2 +- .../ruby/lib/petstore/models/inline_response_default.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/list.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/map_test.rb | 2 +- .../models/mixed_properties_and_additional_properties_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/model200_response.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/model_return.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/name.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/nullable_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/number_only.rb | 2 +- .../ruby/lib/petstore/models/object_with_deprecated_fields.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/order.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/outer_composite.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb | 2 +- .../ruby/lib/petstore/models/outer_enum_default_value.rb | 2 +- .../petstore/ruby/lib/petstore/models/outer_enum_integer.rb | 2 +- .../lib/petstore/models/outer_enum_integer_default_value.rb | 2 +- .../ruby/lib/petstore/models/outer_object_with_enum_property.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/pet.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/read_only_first.rb | 2 +- .../petstore/ruby/lib/petstore/models/special_model_name.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/tag.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/user.rb | 2 +- samples/client/petstore/ruby/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby/petstore.gemspec | 2 +- samples/client/petstore/ruby/spec/api_client_spec.rb | 2 +- samples/client/petstore/ruby/spec/configuration_spec.rb | 2 +- samples/client/petstore/ruby/spec/spec_helper.rb | 2 +- .../petstore/rust/hyper/petstore/.openapi-generator/VERSION | 2 +- .../rust/reqwest/petstore-async/.openapi-generator/VERSION | 2 +- .../petstore/rust/reqwest/petstore/.openapi-generator/VERSION | 2 +- samples/client/petstore/scala-akka/.openapi-generator/VERSION | 2 +- .../scala-httpclient-deprecated/.openapi-generator/VERSION | 2 +- samples/client/petstore/scala-sttp/.openapi-generator/VERSION | 2 +- .../petstore/spring-cloud-async/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud-no-nullable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud-spring-pageable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- samples/client/petstore/spring-cloud/.openapi-generator/VERSION | 2 +- .../spring-cloud/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- samples/client/petstore/spring-stubs/.openapi-generator/VERSION | 2 +- .../spring-stubs/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/swift5/alamofireLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/combineLibrary/.openapi-generator/VERSION | 2 +- .../client/petstore/swift5/default/.openapi-generator/VERSION | 2 +- .../petstore/swift5/deprecated/.openapi-generator/VERSION | 2 +- .../petstore/swift5/nonPublicApi/.openapi-generator/VERSION | 2 +- .../petstore/swift5/objcCompatible/.openapi-generator/VERSION | 2 +- samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION | 2 +- .../swift5/promisekitLibrary/.openapi-generator/VERSION | 2 +- .../swift5/readonlyProperties/.openapi-generator/VERSION | 2 +- .../petstore/swift5/resultLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION | 2 +- .../swift5/urlsessionLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/vaporLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/x-swift-hashable/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/single-request-parameter/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/with-prefixed-module-name/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../typescript-aurelia/default/.openapi-generator/VERSION | 2 +- .../builds/composed-schemas/.openapi-generator/VERSION | 2 +- .../typescript-axios/builds/default/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/with-complex-headers/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/with-interfaces/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../with-single-request-parameters/.openapi-generator/VERSION | 2 +- .../builds/default-v3.0/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/default/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/enum/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/multiple-parameters/.openapi-generator/VERSION | 2 +- .../prefix-parameter-interfaces/.openapi-generator/VERSION | 2 +- .../builds/sagas-and-records/.openapi-generator/VERSION | 2 +- .../builds/typescript-three-plus/.openapi-generator/VERSION | 2 +- .../builds/with-interfaces/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../builds/without-runtime-checks/.openapi-generator/VERSION | 2 +- .../petstore/typescript-inversify/.openapi-generator/VERSION | 2 +- .../typescript-jquery/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-jquery/npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-node/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-node/npm/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../typescript-rxjs/builds/default/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../builds/with-progress-subscriber/.openapi-generator/VERSION | 2 +- .../config/petstore/protobuf-schema/.openapi-generator/VERSION | 2 +- samples/meta-codegen/lib/pom.xml | 2 +- samples/meta-codegen/usage/.openapi-generator/VERSION | 2 +- samples/openapi3/client/elm/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/go-experimental/.openapi-generator/VERSION | 2 +- .../java/jersey2-java8/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/python/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/ruby-client/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api/usage_api.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api_client.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api_error.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/configuration.rb | 2 +- .../x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb | 2 +- .../x-auth-id-alias/ruby-client/spec/api_client_spec.rb | 2 +- .../x-auth-id-alias/ruby-client/spec/configuration_spec.rb | 2 +- .../extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb | 2 +- .../x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec | 2 +- .../features/dynamic-servers/python/.openapi-generator/VERSION | 2 +- .../features/dynamic-servers/ruby/.openapi-generator/VERSION | 2 +- .../features/dynamic-servers/ruby/dynamic_servers.gemspec | 2 +- .../client/features/dynamic-servers/ruby/lib/dynamic_servers.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api_client.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api_error.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/configuration.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/version.rb | 2 +- .../features/dynamic-servers/ruby/spec/api_client_spec.rb | 2 +- .../features/dynamic-servers/ruby/spec/configuration_spec.rb | 2 +- .../client/features/dynamic-servers/ruby/spec/spec_helper.rb | 2 +- .../ruby-client/.openapi-generator/VERSION | 2 +- .../generate-alias-as-model/ruby-client/lib/petstore.rb | 2 +- .../ruby-client/lib/petstore/api/usage_api.rb | 2 +- .../ruby-client/lib/petstore/api_client.rb | 2 +- .../ruby-client/lib/petstore/api_error.rb | 2 +- .../ruby-client/lib/petstore/configuration.rb | 2 +- .../ruby-client/lib/petstore/models/array_alias.rb | 2 +- .../ruby-client/lib/petstore/models/map_alias.rb | 2 +- .../generate-alias-as-model/ruby-client/lib/petstore/version.rb | 2 +- .../generate-alias-as-model/ruby-client/petstore.gemspec | 2 +- .../generate-alias-as-model/ruby-client/spec/api_client_spec.rb | 2 +- .../ruby-client/spec/configuration_spec.rb | 2 +- .../generate-alias-as-model/ruby-client/spec/spec_helper.rb | 2 +- .../petstore_client_lib_fake/.openapi-generator/VERSION | 2 +- .../dart-dio/petstore_client_lib/.openapi-generator/VERSION | 2 +- .../petstore_client_lib_fake/.openapi-generator/VERSION | 2 +- .../dart2/petstore_client_lib/.openapi-generator/VERSION | 2 +- .../dart2/petstore_client_lib_fake/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../client/petstore/go/go-petstore/.openapi-generator/VERSION | 2 +- .../jersey2-java8-special-characters/.openapi-generator/VERSION | 2 +- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 2 +- .../client/petstore/python-legacy/.openapi-generator/VERSION | 2 +- .../openapi3/client/petstore/python/.openapi-generator/VERSION | 2 +- .../builds/composed-schemas/.openapi-generator/VERSION | 2 +- .../typescript/builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript/builds/deno/.openapi-generator/VERSION | 2 +- .../typescript/builds/inversify/.openapi-generator/VERSION | 2 +- .../typescript/builds/jquery/.openapi-generator/VERSION | 2 +- .../typescript/builds/object_params/.openapi-generator/VERSION | 2 +- samples/schema/petstore/ktorm/.openapi-generator/VERSION | 2 +- samples/schema/petstore/mysql/.openapi-generator/VERSION | 2 +- samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-3.0/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-3.1/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-5.0/.openapi-generator/VERSION | 2 +- samples/server/petstore/aspnetcore/.openapi-generator/VERSION | 2 +- samples/server/petstore/cpp-pistache/.openapi-generator/VERSION | 2 +- .../cpp-qt-qhttpengine-server/.openapi-generator/VERSION | 2 +- .../server/petstore/erlang-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-api-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-chi-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-echo-server/.openapi-generator/VERSION | 2 +- .../petstore/go-gin-api-server/.openapi-generator/VERSION | 2 +- .../petstore/go-server-required/.openapi-generator/VERSION | 2 +- .../server/petstore/haskell-servant/.openapi-generator/VERSION | 2 +- samples/server/petstore/java-msf4j/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-play-framework-async/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-play-framework-no-interface/.openapi-generator/VERSION | 2 +- .../java-play-framework-no-nullable/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/java-play-framework/.openapi-generator/VERSION | 2 +- .../server/petstore/java-undertow/.openapi-generator/VERSION | 2 +- .../server/petstore/java-vertx-web/.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-non-spring-app/.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION | 2 +- .../jaxrs-resteasy/default-value/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/default/.openapi-generator/VERSION | 2 +- .../jaxrs-resteasy/eap-java8/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-spec-interface/.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs/jersey1/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs/jersey2/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-server/ktor/.openapi-generator/VERSION | 2 +- samples/server/petstore/kotlin-server/ktor/README.md | 2 +- .../kotlin-springboot-delegate/.openapi-generator/VERSION | 2 +- .../src/main/kotlin/org/openapitools/api/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApi.kt | 2 +- .../kotlin-springboot-reactive/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-springboot/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-laravel/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-lumen/.openapi-generator/VERSION | 2 +- .../petstore/php-mezzio-ph-modern/.openapi-generator/VERSION | 2 +- .../server/petstore/php-mezzio-ph/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-slim4/.openapi-generator/VERSION | 2 +- .../php-symfony/SymfonyBundle-php/.openapi-generator/VERSION | 2 +- .../python-aiohttp-srclayout/.openapi-generator/VERSION | 2 +- .../server/petstore/python-aiohttp/.openapi-generator/VERSION | 2 +- .../petstore/python-blueplanet/.openapi-generator/VERSION | 2 +- .../server/petstore/python-fastapi/.openapi-generator/VERSION | 2 +- samples/server/petstore/python-flask/.openapi-generator/VERSION | 2 +- .../rust-server/output/multipart-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/no-example-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/openapi-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/ops-v3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../output/ping-bearer-auth/.openapi-generator/VERSION | 2 +- .../output/rust-server-test/.openapi-generator/VERSION | 2 +- .../spring-mvc-default-value/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/TestHeadersApi.java | 2 +- .../src/main/java/org/openapitools/api/TestQueryParamsApi.java | 2 +- .../petstore/spring-mvc-j8-async/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-mvc-j8-localdatetime/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/spring-mvc-no-nullable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-mvc-spring-pageable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- samples/server/petstore/spring-mvc/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../spring-mvc/src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../spring-mvc/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../spring-mvc/src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../spring-mvc/src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-beanvalidation/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-delegate-j8/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-delegate/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-implicitHeaders/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-reactive/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-spring-pageable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-useoptional/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-virtualan/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/virtualan/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/FakeApi.java | 2 +- .../org/openapitools/virtualan/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/UserApi.java | 2 +- samples/server/petstore/springboot/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/UserApi.java | 2 +- 681 files changed, 680 insertions(+), 681 deletions(-) diff --git a/docs/generators.md b/docs/generators.md index 5406b6746cf..f1e21a56daf 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -46,7 +46,6 @@ The following generators are available: * [k6 (beta)](generators/k6.md) * [kotlin](generators/kotlin.md) * [lua (beta)](generators/lua.md) -* [micronaut-client](generators/micronaut-client.md) * [nim (beta)](generators/nim.md) * [objc](generators/objc.md) * [ocaml](generators/ocaml.md) diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index ecf3c56c4e4..b977697be92 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 81f86e9cb34..64207fb7f07 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project org.openapitools - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 2a71ae5459a..a098e4692c5 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=5.2.1-SNAPSHOT +openApiGeneratorVersion=5.2.1 # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 11cb549c195..2006ba1ae7a 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml index 368c2a89531..0e38a4834d7 100644 --- a/modules/openapi-generator-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.1-SNAPSHOT + 5.2.1 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 2e0ad09aeee..1c93535ac0a 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 @@ -19,7 +19,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.1-SNAPSHOT + 5.2.1 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 a478bbb8527..80388f92af0 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 @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.1-SNAPSHOT + 5.2.1 diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml index 56620b71e13..34373ba3961 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 5.2.1-SNAPSHOT + 5.2.1 diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 9252181f3f8..bdb4833efa6 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.openapitools openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index be324c44a9c..7405db532b9 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 1189eb81d53..12dc9631fad 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 ../.. diff --git a/pom.xml b/pom.xml index 3d9c301854b..8bedc504939 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom openapi-generator-project - 5.2.1-SNAPSHOT + 5.2.1 https://github.com/openapitools/openapi-generator diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/R/.openapi-generator/VERSION +++ b/samples/client/petstore/R/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/apex/.openapi-generator/VERSION +++ b/samples/client/petstore/apex/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/bash/.openapi-generator/VERSION b/samples/client/petstore/bash/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/bash/.openapi-generator/VERSION +++ b/samples/client/petstore/bash/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/c/.openapi-generator/VERSION +++ b/samples/client/petstore/c/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp index 9021b81920e..df0a8399280 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/ApiClient.h index 75526d1acbb..fc552ac68b9 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp index c17246718ff..d2cda8a39e0 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h index 6306a60b64d..43e55322599 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp index 7eceea77a76..39fcf68d345 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.h b/samples/client/petstore/cpp-restsdk/client/ApiException.h index 520d7fecab5..7d4efd2100a 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiException.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiException.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp index 92e305aa0f6..5a33976c344 100644 --- a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp +++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/HttpContent.h index eff1d674374..48f7aae198c 100644 --- a/samples/client/petstore/cpp-restsdk/client/HttpContent.h +++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h index 3e865324ea4..fdc1924abde 100644 --- a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h +++ b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp index 4d0f3469bee..a5f0ba5776f 100644 --- a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp +++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/JsonBody.h index c1d9932961c..fa1dab81396 100644 --- a/samples/client/petstore/cpp-restsdk/client/JsonBody.h +++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp index 0d95022705f..fd23279bfb2 100644 --- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/ModelBase.h index ca86ae1bdfb..fb75207372d 100644 --- a/samples/client/petstore/cpp-restsdk/client/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp index a60c5669a5e..f6500544ef9 100644 --- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp +++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h index 6030824c841..e7b36a8f015 100644 --- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h +++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/Object.cpp b/samples/client/petstore/cpp-restsdk/client/Object.cpp index 16170c562c7..7dc4977f91e 100644 --- a/samples/client/petstore/cpp-restsdk/client/Object.cpp +++ b/samples/client/petstore/cpp-restsdk/client/Object.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/Object.h b/samples/client/petstore/cpp-restsdk/client/Object.h index e851cfcf57c..f2edff34d54 100644 --- a/samples/client/petstore/cpp-restsdk/client/Object.h +++ b/samples/client/petstore/cpp-restsdk/client/Object.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp index 07719ecfbbb..28b4d3de4b4 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index 503846b1282..5ee2f2eb00f 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp index 5c4dca2fe1a..f85bbf7b2ae 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index 9c41e9ce380..b1ec010d520 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp index b8705d68c8e..c7f1cfe74ab 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 37835849203..d45e44d8c83 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp index 56c5bb9e6e8..6b552446354 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h index 94f852a1400..8402caa67fd 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h +++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp index b76ddf693d7..70fa3312e36 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.h b/samples/client/petstore/cpp-restsdk/client/model/Category.h index 9e9373f6eb8..11ef0619ae7 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Category.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Category.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp index a9ce0599a4d..22808a4704c 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.h b/samples/client/petstore/cpp-restsdk/client/model/Order.h index 57e435365ed..e8dece4475f 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Order.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Order.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp index bdc51156762..5df4b69bed9 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/model/Pet.h index b00832225ad..bd6ff36959c 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Pet.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp index c44e9ed8f47..bc7230b083c 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/model/Tag.h index 98cb24fee2a..ca1cb938450 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Tag.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/model/User.cpp index 371d4a91f97..19b00f7c87f 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/User.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/User.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.h b/samples/client/petstore/cpp-restsdk/client/model/User.h index 3018bc892db..73f9c8234d9 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/User.h +++ b/samples/client/petstore/cpp-restsdk/client/model/User.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 5.2.1. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/crystal/.openapi-generator/VERSION b/samples/client/petstore/crystal/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/crystal/.openapi-generator/VERSION +++ b/samples/client/petstore/crystal/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/crystal/.travis.yml b/samples/client/petstore/crystal/.travis.yml index 44fbaf197b1..3a98194cba6 100644 --- a/samples/client/petstore/crystal/.travis.yml +++ b/samples/client/petstore/crystal/.travis.yml @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # language: crystal diff --git a/samples/client/petstore/crystal/spec/spec_helper.cr b/samples/client/petstore/crystal/spec/spec_helper.cr index 2941dec1e2e..e507f51d9b5 100644 --- a/samples/client/petstore/crystal/spec/spec_helper.cr +++ b/samples/client/petstore/crystal/spec/spec_helper.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # # load modules diff --git a/samples/client/petstore/crystal/src/petstore.cr b/samples/client/petstore/crystal/src/petstore.cr index 23380adf3a9..94392d5576a 100644 --- a/samples/client/petstore/crystal/src/petstore.cr +++ b/samples/client/petstore/crystal/src/petstore.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # # Dependencies diff --git a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr index 444cb083b6b..0d634e5e26d 100644 --- a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/store_api.cr b/samples/client/petstore/crystal/src/petstore/api/store_api.cr index cd1aa5aaa02..acea97cd8a6 100644 --- a/samples/client/petstore/crystal/src/petstore/api/store_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/store_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/user_api.cr b/samples/client/petstore/crystal/src/petstore/api/user_api.cr index 92be60047d7..5e646876191 100644 --- a/samples/client/petstore/crystal/src/petstore/api/user_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/user_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api_client.cr b/samples/client/petstore/crystal/src/petstore/api_client.cr index 3862b59ffbf..639b7fb027e 100644 --- a/samples/client/petstore/crystal/src/petstore/api_client.cr +++ b/samples/client/petstore/crystal/src/petstore/api_client.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/api_error.cr b/samples/client/petstore/crystal/src/petstore/api_error.cr index 0b67e79cfbb..c444d21baf5 100644 --- a/samples/client/petstore/crystal/src/petstore/api_error.cr +++ b/samples/client/petstore/crystal/src/petstore/api_error.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # module Petstore diff --git a/samples/client/petstore/crystal/src/petstore/configuration.cr b/samples/client/petstore/crystal/src/petstore/configuration.cr index ef47e397dfa..911890f2484 100644 --- a/samples/client/petstore/crystal/src/petstore/configuration.cr +++ b/samples/client/petstore/crystal/src/petstore/configuration.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "log" diff --git a/samples/client/petstore/crystal/src/petstore/models/api_response.cr b/samples/client/petstore/crystal/src/petstore/models/api_response.cr index 020f88a8890..0aa1401672c 100644 --- a/samples/client/petstore/crystal/src/petstore/models/api_response.cr +++ b/samples/client/petstore/crystal/src/petstore/models/api_response.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/category.cr b/samples/client/petstore/crystal/src/petstore/models/category.cr index 26df74df71b..8614f582fec 100644 --- a/samples/client/petstore/crystal/src/petstore/models/category.cr +++ b/samples/client/petstore/crystal/src/petstore/models/category.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/order.cr b/samples/client/petstore/crystal/src/petstore/models/order.cr index edd6396c322..81b7ec6f4ab 100644 --- a/samples/client/petstore/crystal/src/petstore/models/order.cr +++ b/samples/client/petstore/crystal/src/petstore/models/order.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/pet.cr b/samples/client/petstore/crystal/src/petstore/models/pet.cr index f1d96ee1a98..4c182f2a79e 100644 --- a/samples/client/petstore/crystal/src/petstore/models/pet.cr +++ b/samples/client/petstore/crystal/src/petstore/models/pet.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/tag.cr b/samples/client/petstore/crystal/src/petstore/models/tag.cr index 5925f74557c..e1d071cf83e 100644 --- a/samples/client/petstore/crystal/src/petstore/models/tag.cr +++ b/samples/client/petstore/crystal/src/petstore/models/tag.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/user.cr b/samples/client/petstore/crystal/src/petstore/models/user.cr index 717a3b1255f..549dc4f3fe0 100644 --- a/samples/client/petstore/crystal/src/petstore/models/user.cr +++ b/samples/client/petstore/crystal/src/petstore/models/user.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 5.2.1-SNAPSHOT +#OpenAPI Generator version: 5.2.1 # require "json" diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/elixir/.openapi-generator/VERSION +++ b/samples/client/petstore/elixir/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/groovy/.openapi-generator/VERSION +++ b/samples/client/petstore/groovy/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION +++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/feign/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/native-async/.openapi-generator/VERSION b/samples/client/petstore/java/native-async/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/native-async/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-async/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/native/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/kotlin/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/lua/.openapi-generator/VERSION b/samples/client/petstore/lua/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/lua/.openapi-generator/VERSION +++ b/samples/client/petstore/lua/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/nim/.openapi-generator/VERSION b/samples/client/petstore/nim/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/nim/.openapi-generator/VERSION +++ b/samples/client/petstore/nim/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/objc/default/.openapi-generator/VERSION b/samples/client/petstore/objc/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/objc/default/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/perl/.openapi-generator/VERSION b/samples/client/petstore/perl/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/perl/.openapi-generator/VERSION +++ b/samples/client/petstore/perl/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/php-dt/.openapi-generator/VERSION b/samples/client/petstore/php-dt/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/php-dt/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 fcc84cb6363..62c47ea89cb 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php index de54ffd1fc8..458c3f503c8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 c9ca32be9bf..062ac3cbf49 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 4348ae44d28..97f31564b5d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 d7c0658ce9e..137ce62eef4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 a2891ba7747..1674a19cf93 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 328e58fff3e..e2ea926b305 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index f22a4019e5b..97e1269f496 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index d699873d37b..08ede23c171 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index bc497ef8844..13bb9ef20e2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 32718c8ae6d..65959fb724d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 839579d7f25..163e62f809a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 46011f3f618..c19126d0e4c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 ddfe3144afe..13c679998d2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 7494ceaf0b1..4b3a4b4405a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 b7f583f4598..48e14d06841 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 8dd06a69540..6e5684946b0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 9b019e7d85c..3157b7a720f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 69d00528fa4..97e4d94378b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 4e5551fbfff..b6a22592fb3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 fefbc42a305..5a7149a3582 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 48c8d033ca1..4bddb9220c2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php index 635d3dd4e35..ba823f98c32 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 2a46e2e36b9..c9bae257ce4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 f001f939638..f7d21be8b8c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 10631dd74cb..82e73381f76 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 c3642d879ab..e5e1030bcb4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 3d4c151ad1d..96399ea3095 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 61fb7ae2ba7..649bd30921c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 2d870ec2907..90442363f0c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php index 13172225beb..0fcf697f640 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 8951e0240a2..3ee90165694 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 be785cb487e..73a64c210a3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php index 6293d7ef43b..34b0c508a76 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php index 86ac6ead27e..e5d4cc7e572 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 3dd8e1c5121..2fc8938084f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 c5444de3bc5..49c3d37a4a6 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 b29bdd2418c..932d163cfcd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 4a973bead88..44426cf3fa3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 6c48d5f884e..b5141620b6e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 02fbfa87358..2308a06b4fa 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 452d9c458f7..366c67e2e5b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index 532b18f6a25..9f816424246 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 01cb90dc381..b734e8c2389 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php index 9c4bec33b2c..92aed7299fd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 8e46653a439..04382857dc1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 a9244433e01..06e5a141a64 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 689af096880..ef0969ff040 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php index f3151f05b9e..8797cd19a63 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php index ba9ae801cbd..7dd33cf086b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php index 33769827808..b6b6de318f4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php index 58266bb0a70..79097964d0a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 5c53ca91889..f7b1fce6fcb 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 17049265983..c742e455236 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 551fd94cbf0..e716f7ceebf 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 5fd6e4917db..5cecd0e8e98 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** 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 f6d4a2661de..566f3d37afd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index bd876d0c289..41699557208 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 5.2.1-SNAPSHOT + * OpenAPI Generator version: 5.2.1 */ /** diff --git a/samples/client/petstore/powershell/.openapi-generator/VERSION b/samples/client/petstore/powershell/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/powershell/.openapi-generator/VERSION +++ b/samples/client/petstore/powershell/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION +++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/client/petstore/python-legacy/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION +++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/python/.openapi-generator/VERSION b/samples/client/petstore/python/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/python/.openapi-generator/VERSION +++ b/samples/client/petstore/python/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION b/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION +++ b/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb index bd0f04b792c..8acc0a5d12d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb index 92b76e8e9a5..161ecb7736c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb index 571880804d4..ca41566124d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index ecf8994c8ea..551ae949314 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb index 92ecb5bfe94..fce716e7a58 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb index 1fcac74ff88..fa2dadb4162 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb index daef7c8ff1a..6bf799e2a1d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb index a8aebf97c02..54f378ea53c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb index 2f2b35b827a..8b6c1efc4a6 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb index bcc7898d50c..c90bafaee6d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb index e193e1e4b10..662fca1ae78 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb index 254ced42e0f..14c285a086b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb index ca97eb8167b..51a1eb71f9f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb index 5157e8e709a..38c8666bc68 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb index 4e6ad34fd37..a534c44f201 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb index 601bedc078b..2e126bc021c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb index 6b264080bde..2c8a75cc7af 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb index 534d927d145..96e91f708a6 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb index f6db6efe5aa..51c72e751a4 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb index c18d0b53bfa..e882fef7e2c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb index 88ec6084dd8..5def8684bfb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb index 39aa024760f..b80cddd74da 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb index db7747b46bb..cc2c6ad999e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb index 8cfd5e7fd63..0aa77682860 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb index b1d6079c82f..d296a8e8446 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb index 1cb84f0e61c..595d80f5ab1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb index 0a9cb55c0aa..18547f31c50 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb index 16a9e4bf8b9..2e33483590d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb index 1acb6f30c05..6be6e988cbd 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb index 4a7ff7aaa82..155c0453344 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb index 9730ea35afd..71532ee4e01 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb index 88efb8fa1e9..6023063557f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb index f38dc93aa97..6361956798f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb index 1182efcfb6c..836bba4f8c5 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb index 2b94909e5ae..34b8a29660b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb index bb6a2f43f8f..46034dc5336 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb index f6caf7e1bf7..577b36d8762 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb index f62e083fbf1..875317ca0b4 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 0b43eb18c5f..734bca177c8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb index 2b621b39f98..2cdc251f948 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb index c8329ddd21d..f32578b123e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb index 0e04c8051e6..19f2a7d6a27 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb index ca62f36112c..45e1fbc56aa 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb index 377b0ebd06d..884e6e4efb3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb index 94606d639a9..bd35dfb1c42 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb index eb69fcb2f65..b4fdcd1077f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb index 6ad098058e5..96d4a360392 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb index 8fcb778f0cd..002a7b2f753 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb index 1e3a0d81e0d..bbc3fc1e8b8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb index 41223e725c1..be24e80c967 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb index f78be4ae36a..58dc7568854 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb index 5999b9b7abd..a1e3cf75bd1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb index 6eeb1b9d31b..8fa9364f7cf 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb index 49c5c4d0fd3..fb7628eb3ac 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb index 6fec567d82b..8f19bbc8b64 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb index 42413453a92..e0d34ed2121 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb index 381f8d7a7fc..0cc78992bbc 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb index 7944842c999..a75cee7905d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec index d849d267391..92365f2048d 100644 --- a/samples/client/petstore/ruby-faraday/petstore.gemspec +++ b/samples/client/petstore/ruby-faraday/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb index df65c967719..51aea24df5d 100644 --- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb index d4ab07f49d1..f3abfb53cb7 100644 --- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb index d3f03e96b98..313e74ad4f4 100644 --- a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index bd0f04b792c..8acc0a5d12d 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 92b76e8e9a5..161ecb7736c 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,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb index 571880804d4..ca41566124d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end 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 ecf8994c8ea..551ae949314 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end 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 92ecb5bfe94..fce716e7a58 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,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end 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 3cf75c585c9..f2c9f5102a4 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end 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 d82e8b07509..3386153b0a1 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end 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 d308b46ba51..f603fbf6548 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index a814753e2e0..1af826fb162 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index bcc7898d50c..c90bafaee6d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index c30c1e5ed20..47ca413e53d 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 254ced42e0f..14c285a086b 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index ca97eb8167b..51a1eb71f9f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 5157e8e709a..38c8666bc68 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 4e6ad34fd37..a534c44f201 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 601bedc078b..2e126bc021c 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 6b264080bde..2c8a75cc7af 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index 534d927d145..96e91f708a6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index f6db6efe5aa..51c72e751a4 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 c18d0b53bfa..e882fef7e2c 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 88ec6084dd8..5def8684bfb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 39aa024760f..b80cddd74da 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index db7747b46bb..cc2c6ad999e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb index 8cfd5e7fd63..0aa77682860 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index b1d6079c82f..d296a8e8446 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 1cb84f0e61c..595d80f5ab1 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 0a9cb55c0aa..18547f31c50 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 16a9e4bf8b9..2e33483590d 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 1acb6f30c05..6be6e988cbd 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 4a7ff7aaa82..155c0453344 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 9730ea35afd..71532ee4e01 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/client/petstore/ruby/lib/petstore/models/foo.rb index 88efb8fa1e9..6023063557f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 f38dc93aa97..6361956798f 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 1182efcfb6c..836bba4f8c5 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb index 2b94909e5ae..34b8a29660b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb b/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb index bb6a2f43f8f..46034dc5336 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index f6caf7e1bf7..577b36d8762 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 f62e083fbf1..875317ca0b4 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 0b43eb18c5f..734bca177c8 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 2b621b39f98..2cdc251f948 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 c8329ddd21d..f32578b123e 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 0e04c8051e6..19f2a7d6a27 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb index ca62f36112c..45e1fbc56aa 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 377b0ebd06d..884e6e4efb3 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb index 94606d639a9..bd35dfb1c42 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index eb69fcb2f65..b4fdcd1077f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 6ad098058e5..96d4a360392 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 8fcb778f0cd..002a7b2f753 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb index 1e3a0d81e0d..bbc3fc1e8b8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb index 41223e725c1..be24e80c967 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb index f78be4ae36a..58dc7568854 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb index 5999b9b7abd..a1e3cf75bd1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 6eeb1b9d31b..8fa9364f7cf 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 49c5c4d0fd3..fb7628eb3ac 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =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 6fec567d82b..8f19bbc8b64 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,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index 42413453a92..e0d34ed2121 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index 381f8d7a7fc..0cc78992bbc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 7944842c999..a75cee7905d 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 39a3335d994..354c53ccb9c 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index c08c2c07b98..7d1e2004a19 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb index d4ab07f49d1..f3abfb53cb7 100644 --- a/samples/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index d3f03e96b98..313e74ad4f4 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/client/petstore/scala-akka/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-akka/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index a1cba950c2e..a798ca8a29f 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 6ac6aa0dd6d..d72c6c19778 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index d23f7860b46..9842b643dfb 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java index b41604a2416..dd2346228f7 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 7d871a200db..5e3d0cbbbf8 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java index ce67facbd04..1cfec674752 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 4f2934463f1..7c0e31e99ee 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 75d029e616f..ad012a9b3e1 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index db03707aff2..50e3fb04111 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 b41604a2416..dd2346228f7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 7d871a200db..5e3d0cbbbf8 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 ce67facbd04..1cfec674752 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 09d81f8f5bb..2ce1baa3434 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 0c1bf6dacb3..9e90b5a75b9 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 e99b43bb880..4ff13ed6692 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/default/.openapi-generator/VERSION b/samples/client/petstore/swift5/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/default/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION +++ b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index 87c5bee9003..955aebed21e 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,7 +121,7 @@ UTF-8 - 5.2.1-SNAPSHOT + 5.2.1 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 862529f8cac..804440660c7 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/elm/.openapi-generator/VERSION b/samples/openapi3/client/elm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/elm/.openapi-generator/VERSION +++ b/samples/openapi3/client/elm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb index 27209ee6258..da4c94bb977 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb index b6902d57386..6413476e439 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb index a519f802521..8d46f38a250 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb index 5644ddf70be..c59ae80b6b7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb index 76aa275da34..8231383cec0 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb index 246a195574d..2f5682717b9 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb index f5832089793..45a88439b12 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb index adf1f285ea7..1c551f35caa 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb index 4ceaf1842c6..ed21e65db64 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec index e47461deb74..330f8b6a319 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec index fe927f40c59..5282d7aa8e4 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec +++ b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb index f54cf39e8c9..21e3b91fb2e 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb index dbacab75927..349b7e7414b 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb index a12f32b07bf..c69219a5f17 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb index 36de5507244..e8271525c59 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb index 658a9776051..38c6d7b0abb 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb index b794287804e..f63295c6155 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb index c7e800a0662..c7085f2fedc 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb index 582cdc3f690..be4cd152638 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb index 953cdfb66fd..b02ac1ab40b 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb index 6af98b16026..188f94870db 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb index 192cc874225..bcecedec46b 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb index 4f2db3ad597..11d52b0b523 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb index 020c22a7eca..63c87d24413 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb index a2e04a83d6f..a25a20a6d3e 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb index 2be4aff06aa..4990a63f596 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb index 07ea0f110d8..8d268ada493 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb index 84e0ae869a4..2ff2fc7d48c 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec index 101c98cef78..2f7d138df08 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb index d2d7ad30930..424167c52f2 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb index 40e58da1a41..9671397b9b6 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb index 0341ec79ac0..f1a08f14415 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 5.2.1-SNAPSHOT +OpenAPI Generator version: 5.2.1 =end diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION index 862529f8cac..804440660c7 100755 --- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/schema/petstore/ktorm/.openapi-generator/VERSION b/samples/schema/petstore/ktorm/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/schema/petstore/ktorm/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/schema/petstore/mysql/.openapi-generator/VERSION +++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION +++ b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/erlang-server/.openapi-generator/VERSION b/samples/server/petstore/erlang-server/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/erlang-server/.openapi-generator/VERSION +++ b/samples/server/petstore/erlang-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/go-server-required/.openapi-generator/VERSION b/samples/server/petstore/go-server-required/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/go-server-required/.openapi-generator/VERSION +++ b/samples/server/petstore/go-server-required/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION +++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-undertow/.openapi-generator/VERSION +++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION +++ b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index 6de4727b134..5d88b9694a4 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 5.2.1-SNAPSHOT. +Generated by OpenAPI Generator 5.2.1. ## Requires diff --git a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index d3de521c130..30eeba4deb5 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index f07c2b2ce5c..c0580916e21 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index f9a0bc72057..f018c38e009 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION +++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION +++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION +++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION +++ b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java index e5ab8393a2e..af71409d921 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java index a8ebe202b01..36fd78aee63 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 2c0dfcfe71c..372e5d0a962 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b6c46774a7a..dacd6df88f5 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 01014fcef3c..3fc449c39d5 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9f0535df6b3..80a90bdf2a2 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 1ce2d8d1d60..b797b787faf 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 1da06389b4a..51d3bb8cffe 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 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.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 130a8494dbb..087b840dab7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 a898482842c..159794cec73 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9d69007a5fc..30c988e8351 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 eeb313bb64d..c4272baa8e4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b0c9dda385a..520f4949b24 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 94d6d8a54d2..e1e3d346589 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 130a8494dbb..087b840dab7 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 66905f536da..968d337764e 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9d69007a5fc..30c988e8351 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java index eeb313bb64d..c4272baa8e4 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index b0c9dda385a..520f4949b24 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 94d6d8a54d2..e1e3d346589 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 130a8494dbb..087b840dab7 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 699019c6df0..65fab43c882 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9d69007a5fc..30c988e8351 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index a68214b854f..64960b54635 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index b0c9dda385a..520f4949b24 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 94d6d8a54d2..e1e3d346589 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 130a8494dbb..087b840dab7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 66905f536da..968d337764e 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9d69007a5fc..30c988e8351 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 eeb313bb64d..c4272baa8e4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b0c9dda385a..520f4949b24 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 94d6d8a54d2..e1e3d346589 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index ad33c6f7a83..42bc101d64a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index eaef34c8ba3..b7e90fa9a36 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8b3234b7a1e..71e0d836920 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 07e67b5ada8..10e67723dae 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index d8ecb702f91..96d85a4272b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 5af29da805a..c7eae39d5e8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 130a8494dbb..087b840dab7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 66905f536da..968d337764e 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9d69007a5fc..30c988e8351 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 eeb313bb64d..c4272baa8e4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b0c9dda385a..520f4949b24 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 94d6d8a54d2..e1e3d346589 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 245441f9a23..6af2e35c73a 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 f9592af7f37..931c0aa3406 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 d2d52eeda84..764c53b2d3e 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 85b266f87c4..c3f3c1db26b 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 79d9cbba24e..dc7dbe6b5fb 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 a662b5e4936..08ddebef735 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 245441f9a23..6af2e35c73a 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 f9592af7f37..931c0aa3406 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 d2d52eeda84..764c53b2d3e 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 85b266f87c4..c3f3c1db26b 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 79d9cbba24e..dc7dbe6b5fb 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 a662b5e4936..08ddebef735 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 be1d9e3ad35..73090e68567 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 c28a732e3bf..edb6accfc6f 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 21cdb4eff66..437c85e0ca4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 c7127759e32..2ca54aa54cd 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b7ae71e7ee2..ef52d3d14ae 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 2029fcada31..40fba9d3a2d 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 2ec496726be..e34c4c2d163 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9fcdea1ba33..1d97679637d 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 4d203b46a90..1471151a981 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 ab93643c9de..3ba09c567a4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 8e6b22f43d6..459c8da9b3b 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 ea4a6d014fc..2106ebf2ee8 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index ad33c6f7a83..42bc101d64a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 63c0b510bb7..5dc83ce011a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8b3234b7a1e..71e0d836920 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index ff2a4095be3..e026dfec729 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index d8ecb702f91..96d85a4272b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 5af29da805a..c7eae39d5e8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 245441f9a23..6af2e35c73a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index f2a0dc0da4a..bb14238024c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d2d52eeda84..764c53b2d3e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index f7b2a4aab46..6a51372137b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index 79d9cbba24e..dc7dbe6b5fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index a662b5e4936..08ddebef735 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index ad33c6f7a83..42bc101d64a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 63c0b510bb7..5dc83ce011a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8b3234b7a1e..71e0d836920 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index ff2a4095be3..e026dfec729 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index d8ecb702f91..96d85a4272b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 5af29da805a..c7eae39d5e8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 130a8494dbb..087b840dab7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 699019c6df0..65fab43c882 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9d69007a5fc..30c988e8351 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index a68214b854f..64960b54635 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index b0c9dda385a..520f4949b24 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 94d6d8a54d2..e1e3d346589 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 130a8494dbb..087b840dab7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 6fa55775869..25e36f0a115 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9d69007a5fc..30c988e8351 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 f7b48a59b60..f865a093dc8 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b0c9dda385a..520f4949b24 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 94d6d8a54d2..e1e3d346589 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 34951cb89a0..33393811ad9 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 3ce4eed402b..7408246b121 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 500843d424d..3aaba627204 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 2318ccc478f..e74e83c1b94 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 865dd508818..767489e88fc 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 240d6031dd9..cfd9d9fbdc3 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 862529f8cac..804440660c7 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.2.1 \ No newline at end of file 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 130a8494dbb..087b840dab7 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 66905f536da..968d337764e 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 9d69007a5fc..30c988e8351 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 eeb313bb64d..c4272baa8e4 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 b0c9dda385a..520f4949b24 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * 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 94d6d8a54d2..e1e3d346589 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,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.2.1). * https://openapi-generator.tech * Do not edit the class manually. */ From da5d611ca98a42f69d21fb844dfb4e26fd558e54 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 16 Aug 2021 21:41:55 +0800 Subject: [PATCH 72/72] update readme --- README.md | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 7ac8f579fe3..7db649d979a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@
                          -[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.2.1`): +[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.3.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/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) @@ -17,14 +17,6 @@ [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/openapitools/openapi-generator/Check%20Supported%20Java%20Versions/master?label=Check%20Supported%20Java%20Versions&logo=github&logoColor=green)](https://github.com/OpenAPITools/openapi-generator/actions?query=workflow%3A%22Check+Supported+Java+Versions%22) - -[5.3.x](https://github.com/OpenAPITools/openapi-generator/tree/5.3.x) (`5.3.x`): -[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.3.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) -[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.3.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) -[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.3.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) -[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.3.x)](https://cloud.drone.io/OpenAPITools/openapi-generator) -[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/5.3.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) - [6.0.x](https://github.com/OpenAPITools/openapi-generator/tree/6.0.x) (`6.0.x`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/6.0.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/6.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) @@ -118,9 +110,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 | OpenAPI Generator Version | Release Date | Notes | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- | | 6.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/) | Nov/Dec 2021 | Minor release with breaking changes (no fallback) | -| 5.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.0-SNAPSHOT/) | Aug/Sep 2021 | Minor release with breaking changes (with fallback) | -| 5.2.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.2.1-SNAPSHOT/) | 09.08.2021 | Patch release (enhancements, bug fixes, etc) | -| [5.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.0) (latest stable release) | 09.07.2021 | Minor release with breaking changes (with fallback) | +| 5.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.0-SNAPSHOT/) | Sep/Oct 2021 | Minor release with breaking changes (with fallback) | +| [5.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.1) (latest stable release) | 016.08.2021 | Patch release (enhancements, bug fixes, etc) | | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) | 06.05.2020 | Patch release (enhancements, bug fixes, etc) | OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0 @@ -177,16 +168,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: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar` +JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar` For **Mac/Linux** users: ```sh -wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar -O openapi-generator-cli.jar +wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.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 https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar +Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar ``` After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage. @@ -411,7 +402,7 @@ openapi-generator-cli version To use a specific version of "openapi-generator-cli" ```sh -openapi-generator-cli version-manager set 5.2.0 +openapi-generator-cli version-manager set 5.2.1 ``` Or install it as dev-dependency: @@ -435,7 +426,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/3_0/petstore.yaml -g php -o c:\temp\php_api_client`) -You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar) +You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.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`