From 0c4f2d77c405edb07c76eafc4dad05211bc9c00a Mon Sep 17 00:00:00 2001 From: Pablo Lazaro <pablo.lazaro@gft.com> Date: Thu, 31 Jan 2019 11:53:11 +0100 Subject: [PATCH 1/5] [Java]: adds snapshotVersion CLI option and uses API version as artifactVersion by default --- .../codegen/CodegenConstants.java | 3 ++ .../languages/AbstractJavaCodegen.java | 34 ++++++++++++ .../codegen/languages/SpringCodegen.java | 2 +- .../codegen/java/AbstractJavaCodegenTest.java | 54 +++++++++++++++++++ .../codegen/java/JavaModelEnumTest.java | 1 + 5 files changed, 93 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index c66cce4b4f6..6d96ec46680 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -283,4 +283,7 @@ public class CodegenConstants { public static final String ENABLE_POST_PROCESS_FILE_DESC = "Enable post-processing file using environment variables."; public static final String OPEN_API_SPEC_NAME = "openAPISpecName"; + + public static final String SNAPSHOT_VERSION = "snapshotVersion"; + public static final String SNAPSHOT_VERSION_DESC = "Uses a SNAPSHOST version."; } \ No newline at end of file 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 b400d31c6b6..746b314c95c 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 @@ -207,6 +207,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC)); cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC)); cliOptions.add(CliOption.newString(CodegenConstants.PARENT_VERSION, CodegenConstants.PARENT_VERSION_DESC)); + cliOptions.add(CliOption.newString(CodegenConstants.SNAPSHOT_VERSION, CodegenConstants.SNAPSHOT_VERSION_DESC)); } @Override @@ -280,11 +281,21 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) { this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION)); + } else if (this.getVersionFromSpecification() != null) { + this.setArtifactVersion(this.getVersionFromSpecification()); } else { //not set, use to be passed to template additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); } + if (additionalProperties.containsKey(CodegenConstants.SNAPSHOT_VERSION)) { + Boolean useSnapshotVersion = Boolean.valueOf((String) additionalProperties.get(CodegenConstants.SNAPSHOT_VERSION)); + + if (useSnapshotVersion) { + this.setArtifactVersion(this.buildSnapshotVersion(this.artifactVersion)); + } + } + if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_URL)) { this.setArtifactUrl((String) additionalProperties.get(CodegenConstants.ARTIFACT_URL)); } else { @@ -1345,6 +1356,29 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code return sb.toString(); } + /** + * Gets version from API specification. + * + * @return API version + */ + private String getVersionFromSpecification () { + if (this.globalOpenAPI != null && this.globalOpenAPI.getInfo() != null) { + return this.globalOpenAPI.getInfo().getVersion(); + } else { + return null; + } + } + + /** + * Builds a SNAPSHOT version from a given version. + * + * @param version + * @return SNAPSHOT version + */ + private String buildSnapshotVersion (String version) { + return version + "-" + "SNAPSHOT"; + } + public void setSupportJava6(boolean value) { this.supportJava6 = value; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 9865d665c2d..f11668b2f56 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -317,7 +317,7 @@ public class SpringCodegen extends AbstractJavaCodegen (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebApplication.java")); supportingFiles.add(new SupportingFile("webMvcConfiguration.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebMvcConfiguration.java")); - supportingFiles.add(new SupportingFile("openapiUiConfiguration.mustache", + supportingFiles.add(new SupportingFile("ope44napiUiConfiguration.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "OpenAPIUiConfiguration.java")); supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "RFC3339DateFormat.java")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index be90e87253e..938e2ce7ba4 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -23,6 +23,7 @@ import io.swagger.v3.parser.core.models.ParseOptions; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.testng.Assert; import org.testng.annotations.Test; @@ -156,6 +157,53 @@ public class AbstractJavaCodegenTest { Assert.assertEquals(codegen.toEnumValue("3.14", "Float"), "3.14f"); } + @Test(description = "tests if API version specification is used if no version is provided in additional properties") + public void openApiversionTest() { + final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); + + OpenAPI api = TestUtils.createOpenAPI(); + codegen.setGlobalOpenAPI(api); + + codegen.processOpts(); + + Assert.assertEquals(codegen.getArtifactVersion(), "1.0.7"); + } + + @Test(description = "tests if artifactVersion additional property is used") + public void additionalPropertyArtifactVersionTest() { + final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); + + codegen.additionalProperties().put("artifactVersion", "1.1.1"); + + OpenAPI api = TestUtils.createOpenAPI(); + codegen.setGlobalOpenAPI(api); + + codegen.processOpts(); + + Assert.assertEquals(codegen.getArtifactVersion(), "1.1.1"); + } + + @Test(description = "tests if default version is used when neither OpenAPI version nor artifactVersion additional property has been provided") + public void defautlVersionTest() { + final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); + + codegen.processOpts(); + + Assert.assertEquals(codegen.getArtifactVersion(), "1.0.0"); + } + + @Test(description = "tests if default version is used when neither OpenAPI version nor artifactVersion additional property has been provided") + public void snapshotVersionTest() { + final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); + + codegen.additionalProperties().put("snapshotVersion", "true"); + + codegen.processOpts(); + + Assert.assertEquals(codegen.getArtifactVersion(), "1.0.0-SNAPSHOT"); + } + + private static class P_AbstractJavaCodegen extends AbstractJavaCodegen { @Override public CodegenType getTag() { @@ -171,5 +219,11 @@ public class AbstractJavaCodegenTest { public String getHelp() { return null; } + + /** + * Gets artifact version. + * Only for testing purposes. + */ + public String getArtifactVersion () { return this.artifactVersion; } } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java index 2244bfd208d..6f5081331ae 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java @@ -25,6 +25,7 @@ import io.swagger.v3.oas.models.media.StringSchema; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.DefaultCodegen; +import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.openapitools.codegen.languages.JavaClientCodegen; import org.testng.Assert; import org.testng.annotations.Test; -- GitLab From 01580a726fa4aa045d0b48e809619705a1a5641a Mon Sep 17 00:00:00 2001 From: Pablo Lazaro <pablo.lazaro@gft.com> Date: Thu, 31 Jan 2019 12:03:18 +0100 Subject: [PATCH 2/5] fix some typos --- .../main/java/org/openapitools/codegen/CodegenConstants.java | 2 +- .../java/org/openapitools/codegen/languages/SpringCodegen.java | 2 +- .../java/org/openapitools/codegen/java/JavaModelEnumTest.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 6d96ec46680..907733516c3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -285,5 +285,5 @@ public class CodegenConstants { public static final String OPEN_API_SPEC_NAME = "openAPISpecName"; public static final String SNAPSHOT_VERSION = "snapshotVersion"; - public static final String SNAPSHOT_VERSION_DESC = "Uses a SNAPSHOST version."; + public static final String SNAPSHOT_VERSION_DESC = "Uses a SNAPSHOT version."; } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index f11668b2f56..9865d665c2d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -317,7 +317,7 @@ public class SpringCodegen extends AbstractJavaCodegen (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebApplication.java")); supportingFiles.add(new SupportingFile("webMvcConfiguration.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebMvcConfiguration.java")); - supportingFiles.add(new SupportingFile("ope44napiUiConfiguration.mustache", + supportingFiles.add(new SupportingFile("openapiUiConfiguration.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "OpenAPIUiConfiguration.java")); supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache", (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "RFC3339DateFormat.java")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java index 6f5081331ae..2244bfd208d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java @@ -25,7 +25,6 @@ import io.swagger.v3.oas.models.media.StringSchema; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.DefaultCodegen; -import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.openapitools.codegen.languages.JavaClientCodegen; import org.testng.Assert; import org.testng.annotations.Test; -- GitLab From 873cf7325a2ea80c2e18f5a6548b31fcdcc4356c Mon Sep 17 00:00:00 2001 From: Pablo Lazaro <pablo.lazaro@gft.com> Date: Thu, 7 Feb 2019 18:42:49 +0100 Subject: [PATCH 3/5] fix naming diff between branches --- .../openapitools/codegen/languages/AbstractJavaCodegen.java | 4 ++-- .../openapitools/codegen/java/AbstractJavaCodegenTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 d861b9efb00..aaf60492a66 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 @@ -1362,8 +1362,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code * @return API version */ private String getVersionFromSpecification () { - if (this.globalOpenAPI != null && this.globalOpenAPI.getInfo() != null) { - return this.globalOpenAPI.getInfo().getVersion(); + if (this.openAPI != null && this.openAPI.getInfo() != null) { + return this.openAPI.getInfo().getVersion(); } else { return null; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 47f0526f46d..2ad0d84861a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -206,7 +206,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); OpenAPI api = TestUtils.createOpenAPI(); - codegen.setGlobalOpenAPI(api); + codegen.setOpenAPI(api); codegen.processOpts(); @@ -220,7 +220,7 @@ public class AbstractJavaCodegenTest { codegen.additionalProperties().put("artifactVersion", "1.1.1"); OpenAPI api = TestUtils.createOpenAPI(); - codegen.setGlobalOpenAPI(api); + codegen.setOpenAPI(api); codegen.processOpts(); -- GitLab From 080b14a05c69b2c4c8fad95fe53c9ff2550f3fad Mon Sep 17 00:00:00 2001 From: Pablo Lazaro <pablo.lazaro@gft.com> Date: Thu, 7 Feb 2019 22:16:01 +0100 Subject: [PATCH 4/5] ensure-up-to-date --- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../client/petstore/php/OpenAPIClient-php/README.md | 2 +- .../php/OpenAPIClient-php/docs/Api/FakeApi.md | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeApi.php | 2 +- samples/openapi3/client/petstore/python/README.md | 2 +- .../openapi3/client/petstore/python/docs/FakeApi.md | 4 ++-- .../petstore/python/petstore_api/configuration.py | 1 - .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 12 ++++++------ .../php-ze-ph/src/App/Handler/AnotherFakeDummy.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/Fake.php | 8 ++++---- .../src/App/Handler/FakeBodyWithFileSchema.php | 2 +- .../src/App/Handler/FakeBodyWithQueryParams.php | 2 +- .../php-ze-ph/src/App/Handler/FakeClassnameTest.php | 2 +- .../php-ze-ph/src/App/Handler/FakeCreateXmlItem.php | 2 +- .../App/Handler/FakeInlineAdditionalProperties.php | 2 +- .../php-ze-ph/src/App/Handler/FakeJsonFormData.php | 2 +- .../php-ze-ph/src/App/Handler/FakeOuterBoolean.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterComposite.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterNumber.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterString.php | 4 ++-- .../Handler/FakePetIdUploadImageWithRequiredFile.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/Pet.php | 4 ++-- .../php-ze-ph/src/App/Handler/PetFindByStatus.php | 2 +- .../php-ze-ph/src/App/Handler/PetFindByTags.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/PetPetId.php | 6 +++--- .../src/App/Handler/PetPetIdUploadImage.php | 2 +- .../php-ze-ph/src/App/Handler/StoreInventory.php | 2 +- .../php-ze-ph/src/App/Handler/StoreOrder.php | 2 +- .../php-ze-ph/src/App/Handler/StoreOrderOrderId.php | 4 ++-- .../petstore/php-ze-ph/src/App/Handler/User.php | 2 +- .../src/App/Handler/UserCreateWithArray.php | 2 +- .../php-ze-ph/src/App/Handler/UserCreateWithList.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/UserLogin.php | 2 +- .../php-ze-ph/src/App/Handler/UserLogout.php | 2 +- .../php-ze-ph/src/App/Handler/UserUsername.php | 6 +++--- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../org/openapitools/virtualan/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- 76 files changed, 94 insertions(+), 95 deletions(-) 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 8cbcb42e021..cc18f159859 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 @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java index 7bf6253b536..b628e2f0a0a 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java index 177b241f2a2..c934e80e1c2 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java @@ -183,7 +183,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java index 7bf6253b536..b628e2f0a0a 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java index eb56e52b2e2..ae862ca6b34 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java @@ -242,7 +242,7 @@ public class EnumTest implements Parcelable { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java index 2c2519f8ca7..a6c0f1e3939 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java @@ -199,7 +199,7 @@ public class EnumTest { @JsonProperty("outerEnum") @JacksonXmlProperty(localName = "outerEnum") @XmlElement(name = "outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java index f6e5c2f5372..debb500a72f 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java index f6e5c2f5372..debb500a72f 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java index f6e5c2f5372..debb500a72f 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java index 0fa66e2c7fe..13038a7b28e 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java index 8cbcb42e021..cc18f159859 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; 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 8cbcb42e021..cc18f159859 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 @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md index bac4d14fe8e..9996b06db82 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md @@ -184,7 +184,7 @@ Class | Method | HTTP request | Description ## bearer_test -- **Type**: Bearer authentication (JWT) +- **Type**: Bearer authentication ## http_basic_test diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md index e6804845b95..f3a1f940bdc 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md @@ -522,7 +522,7 @@ Fake endpoint to test group parameters (optional) <?php require_once(__DIR__ . '/vendor/autoload.php'); -// Configure Bearer (JWT) authorization: bearer_test +// Configure Bearer authorization: bearer_test $config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN'); diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 5e86d0aeed0..9c246cb7107 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -2791,7 +2791,7 @@ class FakeApi } } - // this endpoint requires Bearer (JWT) authentication (access token) + // this endpoint requires Bearer authentication (access token) if ($this->config->getAccessToken() !== null) { $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken(); } diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 080ec68a505..91724250fe4 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -174,7 +174,7 @@ Class | Method | HTTP request | Description ## bearer_test -- **Type**: Bearer authentication (JWT) +- **Type**: Bearer authentication ## http_basic_test diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index 6e4f1f2d310..24a9267eb0f 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -503,7 +503,7 @@ Fake endpoint to test group parameters (optional) ### Example -* Bearer (JWT) Authentication (bearer_test): +* Bearer Authentication (bearer_test): ```python from __future__ import print_function import time @@ -511,7 +511,7 @@ import petstore_api from petstore_api.rest import ApiException from pprint import pprint configuration = petstore_api.Configuration() -# Configure Bearer authorization (JWT): bearer_test +# Configure Bearer authorization: bearer_test configuration.access_token = 'YOUR_BEARER_TOKEN' # create an instance of the API class diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index abdb7294a23..bab347d155a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -231,7 +231,6 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): { 'type': 'bearer', 'in': 'header', - 'format': 'JWT', 'key': 'Authorization', 'value': 'Bearer ' + self.access_token }, diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java index 4b2d68c37d7..e43caf57a76 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java @@ -158,7 +158,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") @Valid - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; /** * Get enumString * @return enumString diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java index 870101f63d2..65964de9b5c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java @@ -170,7 +170,7 @@ public class EnumTest implements Serializable { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..7917dffad21 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java index 797a5de3c3f..d3f41560189 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java @@ -153,7 +153,7 @@ public enum EnumNumberEnum { } private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private @Valid OuterEnum outerEnum = null; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java index 797a5de3c3f..d3f41560189 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java @@ -153,7 +153,7 @@ public enum EnumNumberEnum { } private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private @Valid OuterEnum outerEnum = null; /** **/ diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..7917dffad21 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..7917dffad21 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..7917dffad21 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..7917dffad21 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; 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 ecccdb3058c..19e967e41ed 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -44,22 +44,22 @@ interface PetApiInterface { /** - * Sets authentication method api_key + * Sets authentication method petstore_auth * - * @param string $value Value of the api_key authentication method. + * @param string $value Value of the petstore_auth authentication method. * * @return void */ - public function setapi_key($value); + public function setpetstore_auth($value); /** - * Sets authentication method petstore_auth + * Sets authentication method api_key * - * @param string $value Value of the petstore_auth authentication method. + * @param string $value Value of the api_key authentication method. * * @return void */ - public function setpetstore_auth($value); + public function setapi_key($value); /** * Operation addPet diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php index ee20ba08d24..14c909284a0 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php @@ -17,7 +17,7 @@ class AnotherFakeDummy { /** * To test special tags - * @PHA\Patch() + * @PHA\handlePatch * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php index d93574b0367..470ed213d4b 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php @@ -17,7 +17,7 @@ class Fake { /** * To test \"client\" model - * @PHA\Patch() + * @PHA\handlePatch * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) @@ -38,7 +38,7 @@ class Fake } /** * Fake endpoint for testing various parameters å‡ç«¯é»ž å½ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆ 가짜 엔드 í¬ì¸íЏ - * @PHA\Post() + * @PHA\handlePost * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -50,7 +50,7 @@ class Fake } /** * To test enum parameters - * @PHA\Get() + * @PHA\handleGet * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -62,7 +62,7 @@ class Fake } /** * Fake endpoint to test group parameters (optional) - * @PHA\Delete() + * @PHA\handleDelete * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php index 47ce029df6e..3558e8774cb 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php @@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface; class FakeBodyWithFileSchema { /** - * @PHA\Put() + * @PHA\handlePut * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\FileSchemaTestClass::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php index 9844c597816..dceb6596ba2 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php @@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface; class FakeBodyWithQueryParams { /** - * @PHA\Put() + * @PHA\handlePut * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php index 74991195dce..c32c1fad061 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php @@ -17,7 +17,7 @@ class FakeClassnameTest { /** * To test class name in snake case - * @PHA\Patch() + * @PHA\handlePatch * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php index ec96b29c8ef..c97907e2174 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php @@ -17,7 +17,7 @@ class FakeCreateXmlItem { /** * creates an XmlItem - * @PHA\Post() + * @PHA\handlePost * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php index bb6868c68e3..c6fd3bdee9f 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php @@ -17,7 +17,7 @@ class FakeInlineAdditionalProperties { /** * test inline additionalProperties - * @PHA\Post() + * @PHA\handlePost * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if attribute is valid and can handle your container type diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php index ed3e0f6d2ef..05f67537fd0 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php @@ -17,7 +17,7 @@ class FakeJsonFormData { /** * test json serialization of form data - * @PHA\Get() + * @PHA\handleGet * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php index 2ecd0bc9c7d..72e86c1de80 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterBoolean { /** - * @PHA\Post() + * @PHA\handlePost * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php index 8f3a4081caf..f698c3409c2 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php @@ -16,10 +16,10 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterComposite { /** - * @PHA\Post() + * @PHA\handlePost * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\OuterComposite::class,"objectAttr":"bodyData"}) * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php index 595690de897..cd8635cc6c3 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterNumber { /** - * @PHA\Post() + * @PHA\handlePost * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php index 7ce93abfdbd..ad4be0f6806 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterString { /** - * @PHA\Post() + * @PHA\handlePost * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php index 7648339dd49..e60b467f135 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php @@ -17,7 +17,7 @@ class FakePetIdUploadImageWithRequiredFile { /** * uploads an image (required) - * @PHA\Post() + * @PHA\handlePost * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php index 064a9712bf8..6e41dbfe285 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php @@ -17,7 +17,7 @@ class Pet { /** * Add a new pet to the store - * @PHA\Post() + * @PHA\handlePost * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation @@ -36,7 +36,7 @@ class Pet } /** * Update an existing pet - * @PHA\Put() + * @PHA\handlePut * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php index 65fe83918d4..1b5dfd1d2dd 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php @@ -17,7 +17,7 @@ class PetFindByStatus { /** * Finds Pets by status - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php index 0126ada37c0..eb22aa3f0a7 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php @@ -17,7 +17,7 @@ class PetFindByTags { /** * Finds Pets by tags - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php index 625bbf5832c..3d39994737d 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php @@ -17,7 +17,7 @@ class PetPetId { /** * Deletes a pet - * @PHA\Delete() + * @PHA\handleDelete * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class PetPetId } /** * Find pet by ID - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation @@ -47,7 +47,7 @@ class PetPetId } /** * Updates a pet in the store with form data - * @PHA\Post() + * @PHA\handlePost * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php index 67cc0784caa..db143c6f752 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php @@ -17,7 +17,7 @@ class PetPetIdUploadImage { /** * uploads an image - * @PHA\Post() + * @PHA\handlePost * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php index 6d6d3ceb946..1596b36f5ca 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php @@ -17,7 +17,7 @@ class StoreInventory { /** * Returns pet inventories by status - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php index 23623764409..a777451785d 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php @@ -17,7 +17,7 @@ class StoreOrder { /** * Place an order for a pet - * @PHA\Post() + * @PHA\handlePost * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Order::class,"objectAttr":"bodyData"}) * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php index 28aa169a0c8..9618069ea9a 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php @@ -17,7 +17,7 @@ class StoreOrderOrderId { /** * Delete purchase order by ID - * @PHA\Delete() + * @PHA\handleDelete * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class StoreOrderOrderId } /** * Find purchase order by ID - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php index 9d3d8ceb9e3..c016c23e071 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php @@ -17,7 +17,7 @@ class User { /** * Create user - * @PHA\Post() + * @PHA\handlePost * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) * @param ServerRequestInterface $request * diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php index 8ac24b28f2f..b0e44209dc7 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php @@ -17,7 +17,7 @@ class UserCreateWithArray { /** * Creates list of users with given input array - * @PHA\Post() + * @PHA\handlePost * TODO check if attribute is valid and can handle your container type * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"}) * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php index 27ccafbb5d2..78532988688 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php @@ -17,7 +17,7 @@ class UserCreateWithList { /** * Creates list of users with given input array - * @PHA\Post() + * @PHA\handlePost * TODO check if attribute is valid and can handle your container type * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"}) * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php index 2322e8f2317..886b8bb0c3b 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php @@ -17,7 +17,7 @@ class UserLogin { /** * Logs user into the system - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php index 4c0d8b1bb06..3c858e04f80 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php @@ -17,7 +17,7 @@ class UserLogout { /** * Logs out current logged in user session - * @PHA\Get() + * @PHA\handleGet * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php index 290bfeb9731..fbeea79285d 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php @@ -17,7 +17,7 @@ class UserUsername { /** * Delete user - * @PHA\Delete() + * @PHA\handleDelete * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class UserUsername } /** * Get user by user name - * @PHA\Get() + * @PHA\handleGet * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation @@ -47,7 +47,7 @@ class UserUsername } /** * Updated user - * @PHA\Put() + * @PHA\handlePut * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) * @param ServerRequestInterface $request * diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index 94f1603a5bb..7af251c4b35 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java index 42794c669e5..c49ea5efc79 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum; + private OuterEnum outerEnum = null; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; -- GitLab From 84b4f5dc573575697bde688d37b1c754e7bfd3d0 Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Sat, 9 Feb 2019 23:46:18 +0800 Subject: [PATCH 5/5] update samples --- docs/generators/groovy.md | 1 + docs/generators/java-inflector.md | 1 + docs/generators/java-msf4j.md | 1 + docs/generators/java-pkmst.md | 1 + docs/generators/java-play-framework.md | 1 + docs/generators/java-undertow-server.md | 1 + docs/generators/java-vertx.md | 1 + docs/generators/java.md | 1 + docs/generators/jaxrs-cxf-cdi.md | 1 + docs/generators/jaxrs-cxf-client.md | 1 + docs/generators/jaxrs-cxf.md | 1 + docs/generators/jaxrs-jersey.md | 1 + docs/generators/jaxrs-resteasy-eap.md | 1 + docs/generators/jaxrs-resteasy.md | 1 + docs/generators/jaxrs-spec.md | 1 + docs/generators/spring.md | 1 + .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 2 +- .../client/petstore/php/OpenAPIClient-php/README.md | 2 +- .../php/OpenAPIClient-php/docs/Api/FakeApi.md | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeApi.php | 2 +- samples/openapi3/client/petstore/python/README.md | 2 +- .../openapi3/client/petstore/python/docs/FakeApi.md | 4 ++-- .../petstore/python/petstore_api/configuration.py | 1 + .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../gen/java/org/openapitools/model/EnumTest.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 12 ++++++------ .../php-ze-ph/src/App/Handler/AnotherFakeDummy.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/Fake.php | 8 ++++---- .../src/App/Handler/FakeBodyWithFileSchema.php | 2 +- .../src/App/Handler/FakeBodyWithQueryParams.php | 2 +- .../php-ze-ph/src/App/Handler/FakeClassnameTest.php | 2 +- .../php-ze-ph/src/App/Handler/FakeCreateXmlItem.php | 2 +- .../App/Handler/FakeInlineAdditionalProperties.php | 2 +- .../php-ze-ph/src/App/Handler/FakeJsonFormData.php | 2 +- .../php-ze-ph/src/App/Handler/FakeOuterBoolean.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterComposite.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterNumber.php | 4 ++-- .../php-ze-ph/src/App/Handler/FakeOuterString.php | 4 ++-- .../Handler/FakePetIdUploadImageWithRequiredFile.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/Pet.php | 4 ++-- .../php-ze-ph/src/App/Handler/PetFindByStatus.php | 2 +- .../php-ze-ph/src/App/Handler/PetFindByTags.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/PetPetId.php | 6 +++--- .../src/App/Handler/PetPetIdUploadImage.php | 2 +- .../php-ze-ph/src/App/Handler/StoreInventory.php | 2 +- .../php-ze-ph/src/App/Handler/StoreOrder.php | 2 +- .../php-ze-ph/src/App/Handler/StoreOrderOrderId.php | 4 ++-- .../petstore/php-ze-ph/src/App/Handler/User.php | 2 +- .../src/App/Handler/UserCreateWithArray.php | 2 +- .../php-ze-ph/src/App/Handler/UserCreateWithList.php | 2 +- .../petstore/php-ze-ph/src/App/Handler/UserLogin.php | 2 +- .../php-ze-ph/src/App/Handler/UserLogout.php | 2 +- .../php-ze-ph/src/App/Handler/UserUsername.php | 6 +++--- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- .../org/openapitools/virtualan/model/EnumTest.java | 2 +- .../main/java/org/openapitools/model/EnumTest.java | 2 +- 92 files changed, 111 insertions(+), 94 deletions(-) diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md index fa5e542697f..4db3e689c3e 100644 --- a/docs/generators/groovy.md +++ b/docs/generators/groovy.md @@ -42,4 +42,5 @@ sidebar_label: groovy |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |configPackage|configuration package for generated code| |null| diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index e2b2fc439f2..aafb80e32e6 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -42,3 +42,4 @@ sidebar_label: java-inflector |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md index 899e7c7e7e7..a0c5a004daf 100644 --- a/docs/generators/java-msf4j.md +++ b/docs/generators/java-msf4j.md @@ -42,6 +42,7 @@ sidebar_label: java-msf4j |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md index baefba28819..a7e86e24744 100644 --- a/docs/generators/java-pkmst.md +++ b/docs/generators/java-pkmst.md @@ -42,6 +42,7 @@ sidebar_label: java-pkmst |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |groupId|groupId in generated pom.xml| |null| |artifactId|artifactId in generated pom.xml| |null| |artifactVersion|artifact version in generated pom.xml| |null| diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md index 444c85a52a3..1ca0493be05 100644 --- a/docs/generators/java-play-framework.md +++ b/docs/generators/java-play-framework.md @@ -42,6 +42,7 @@ sidebar_label: java-play-framework |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |title|server title name or client service name| |null| |configPackage|configuration package for generated code| |null| |basePackage|base package for generated code| |null| diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md index 0f9ce1d7772..2cd0412b45e 100644 --- a/docs/generators/java-undertow-server.md +++ b/docs/generators/java-undertow-server.md @@ -42,3 +42,4 @@ sidebar_label: java-undertow-server |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md index a2e56703018..09c8a864ab2 100644 --- a/docs/generators/java-vertx.md +++ b/docs/generators/java-vertx.md @@ -42,5 +42,6 @@ sidebar_label: java-vertx |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |rxInterface|When specified, API interfaces are generated with RX and methods return Single<> and Comparable.| |false| |vertxSwaggerRouterVersion|Specify the version of the swagger router library| |null| diff --git a/docs/generators/java.md b/docs/generators/java.md index 34f3f29b363..7e80d48ade2 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -42,6 +42,7 @@ sidebar_label: java |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |useRxJava|Whether to use the RxJava adapter with the retrofit2 library.| |false| |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library.| |false| |parcelableModel|Whether to generate models for Android that implement Parcelable with the okhttp-gson library.| |false| diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md index aaab6233b0f..fa38c4df7b9 100644 --- a/docs/generators/jaxrs-cxf-cdi.md +++ b/docs/generators/jaxrs-cxf-cdi.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-cxf-cdi |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index 53309c560f8..15a35f00bc3 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-cxf-client |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |useBeanValidation|Use BeanValidation API annotations| |false| |useGzipFeatureForTests|Use Gzip Feature for tests| |false| |useLoggingFeatureForTests|Use Logging Feature for tests| |false| diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index 93ce3dfb310..3e72e8b5c4c 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-cxf |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md index b9a44df0ecc..1bcb0e122d6 100644 --- a/docs/generators/jaxrs-jersey.md +++ b/docs/generators/jaxrs-jersey.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-jersey |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md index 03275a94975..2d2a8846f75 100644 --- a/docs/generators/jaxrs-resteasy-eap.md +++ b/docs/generators/jaxrs-resteasy-eap.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-resteasy-eap |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md index ae148d03a22..523b6b05bd9 100644 --- a/docs/generators/jaxrs-resteasy.md +++ b/docs/generators/jaxrs-resteasy.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-resteasy |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md index e421039fc8e..f575bdedd84 100644 --- a/docs/generators/jaxrs-spec.md +++ b/docs/generators/jaxrs-spec.md @@ -42,6 +42,7 @@ sidebar_label: jaxrs-spec |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |implFolder|folder for generated implementation code| |null| |title|a title describing the application| |null| |useBeanValidation|Use BeanValidation API annotations| |true| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index f7a3fe37a30..81bda9efa71 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -42,6 +42,7 @@ sidebar_label: spring |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentArtifactId|parent artifactId 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| +|snapshotVersion|Uses a SNAPSHOT version.| |null| |title|server title name or client service name| |null| |configPackage|configuration package for generated code| |null| |basePackage|base package (invokerPackage) for generated code| |null| 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 cc18f159859..8cbcb42e021 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 @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java index b628e2f0a0a..7bf6253b536 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java index c934e80e1c2..177b241f2a2 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java @@ -183,7 +183,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java index b628e2f0a0a..7bf6253b536 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java index ae862ca6b34..eb56e52b2e2 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java @@ -242,7 +242,7 @@ public class EnumTest implements Parcelable { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java index a6c0f1e3939..2c2519f8ca7 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java @@ -199,7 +199,7 @@ public class EnumTest { @JsonProperty("outerEnum") @JacksonXmlProperty(localName = "outerEnum") @XmlElement(name = "outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java index debb500a72f..f6e5c2f5372 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java index debb500a72f..f6e5c2f5372 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java index debb500a72f..f6e5c2f5372 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java @@ -186,7 +186,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java index 13038a7b28e..0fa66e2c7fe 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -240,7 +240,7 @@ public class EnumTest { public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum"; @SerializedName(SERIALIZED_NAME_OUTER_ENUM) - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java index cc18f159859..8cbcb42e021 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; 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 cc18f159859..8cbcb42e021 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 @@ -184,7 +184,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md index 9996b06db82..bac4d14fe8e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md @@ -184,7 +184,7 @@ Class | Method | HTTP request | Description ## bearer_test -- **Type**: Bearer authentication +- **Type**: Bearer authentication (JWT) ## http_basic_test diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md index f3a1f940bdc..e6804845b95 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md @@ -522,7 +522,7 @@ Fake endpoint to test group parameters (optional) <?php require_once(__DIR__ . '/vendor/autoload.php'); -// Configure Bearer authorization: bearer_test +// Configure Bearer (JWT) authorization: bearer_test $config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN'); diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 9c246cb7107..5e86d0aeed0 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -2791,7 +2791,7 @@ class FakeApi } } - // this endpoint requires Bearer authentication (access token) + // this endpoint requires Bearer (JWT) authentication (access token) if ($this->config->getAccessToken() !== null) { $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken(); } diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 91724250fe4..080ec68a505 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -174,7 +174,7 @@ Class | Method | HTTP request | Description ## bearer_test -- **Type**: Bearer authentication +- **Type**: Bearer authentication (JWT) ## http_basic_test diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index 24a9267eb0f..6e4f1f2d310 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -503,7 +503,7 @@ Fake endpoint to test group parameters (optional) ### Example -* Bearer Authentication (bearer_test): +* Bearer (JWT) Authentication (bearer_test): ```python from __future__ import print_function import time @@ -511,7 +511,7 @@ import petstore_api from petstore_api.rest import ApiException from pprint import pprint configuration = petstore_api.Configuration() -# Configure Bearer authorization: bearer_test +# Configure Bearer authorization (JWT): bearer_test configuration.access_token = 'YOUR_BEARER_TOKEN' # create an instance of the API class diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index bab347d155a..abdb7294a23 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -231,6 +231,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): { 'type': 'bearer', 'in': 'header', + 'format': 'JWT', 'key': 'Authorization', 'value': 'Bearer ' + self.access_token }, diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java index e43caf57a76..4b2d68c37d7 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java @@ -158,7 +158,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") @Valid - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; /** * Get enumString * @return enumString diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java index 65964de9b5c..870101f63d2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java @@ -170,7 +170,7 @@ public class EnumTest implements Serializable { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java index 7917dffad21..1554bbad0d6 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java index d3f41560189..797a5de3c3f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java @@ -153,7 +153,7 @@ public enum EnumNumberEnum { } private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum = null; + private @Valid OuterEnum outerEnum; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java index d3f41560189..797a5de3c3f 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java @@ -153,7 +153,7 @@ public enum EnumNumberEnum { } private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum = null; + private @Valid OuterEnum outerEnum; /** **/ diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 7917dffad21..1554bbad0d6 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java index 7917dffad21..1554bbad0d6 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 7917dffad21..1554bbad0d6 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java index 7917dffad21..1554bbad0d6 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java @@ -169,7 +169,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; 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 19e967e41ed..ecccdb3058c 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -44,22 +44,22 @@ interface PetApiInterface { /** - * Sets authentication method petstore_auth + * Sets authentication method api_key * - * @param string $value Value of the petstore_auth authentication method. + * @param string $value Value of the api_key authentication method. * * @return void */ - public function setpetstore_auth($value); + public function setapi_key($value); /** - * Sets authentication method api_key + * Sets authentication method petstore_auth * - * @param string $value Value of the api_key authentication method. + * @param string $value Value of the petstore_auth authentication method. * * @return void */ - public function setapi_key($value); + public function setpetstore_auth($value); /** * Operation addPet diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php index 14c909284a0..ee20ba08d24 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php @@ -17,7 +17,7 @@ class AnotherFakeDummy { /** * To test special tags - * @PHA\handlePatch + * @PHA\Patch() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php index 470ed213d4b..d93574b0367 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php @@ -17,7 +17,7 @@ class Fake { /** * To test \"client\" model - * @PHA\handlePatch + * @PHA\Patch() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) @@ -38,7 +38,7 @@ class Fake } /** * Fake endpoint for testing various parameters å‡ç«¯é»ž å½ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆ 가짜 엔드 í¬ì¸íЏ - * @PHA\handlePost + * @PHA\Post() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -50,7 +50,7 @@ class Fake } /** * To test enum parameters - * @PHA\handleGet + * @PHA\Get() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -62,7 +62,7 @@ class Fake } /** * Fake endpoint to test group parameters (optional) - * @PHA\handleDelete + * @PHA\Delete() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php index 3558e8774cb..47ce029df6e 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php @@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface; class FakeBodyWithFileSchema { /** - * @PHA\handlePut + * @PHA\Put() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\FileSchemaTestClass::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php index dceb6596ba2..9844c597816 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php @@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface; class FakeBodyWithQueryParams { /** - * @PHA\handlePut + * @PHA\Put() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php index c32c1fad061..74991195dce 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php @@ -17,7 +17,7 @@ class FakeClassnameTest { /** * To test class name in snake case - * @PHA\handlePatch + * @PHA\Patch() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"}) diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php index c97907e2174..ec96b29c8ef 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php @@ -17,7 +17,7 @@ class FakeCreateXmlItem { /** * creates an XmlItem - * @PHA\handlePost + * @PHA\Post() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php index c6fd3bdee9f..bb6868c68e3 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php @@ -17,7 +17,7 @@ class FakeInlineAdditionalProperties { /** * test inline additionalProperties - * @PHA\handlePost + * @PHA\Post() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if attribute is valid and can handle your container type diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php index 05f67537fd0..ed3e0f6d2ef 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php @@ -17,7 +17,7 @@ class FakeJsonFormData { /** * test json serialization of form data - * @PHA\handleGet + * @PHA\Get() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php index 72e86c1de80..2ecd0bc9c7d 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterBoolean { /** - * @PHA\handlePost + * @PHA\Post() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php index f698c3409c2..8f3a4081caf 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php @@ -16,10 +16,10 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterComposite { /** - * @PHA\handlePost + * @PHA\Post() * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\OuterComposite::class,"objectAttr":"bodyData"}) * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php index cd8635cc6c3..595690de897 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterNumber { /** - * @PHA\handlePost + * @PHA\Post() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php index ad4be0f6806..7ce93abfdbd 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php @@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface; class FakeOuterString { /** - * @PHA\handlePost + * @PHA\Post() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a") * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php index e60b467f135..7648339dd49 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php @@ -17,7 +17,7 @@ class FakePetIdUploadImageWithRequiredFile { /** * uploads an image (required) - * @PHA\handlePost + * @PHA\Post() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php index 6e41dbfe285..064a9712bf8 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php @@ -17,7 +17,7 @@ class Pet { /** * Add a new pet to the store - * @PHA\handlePost + * @PHA\Post() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation @@ -36,7 +36,7 @@ class Pet } /** * Update an existing pet - * @PHA\handlePut + * @PHA\Put() * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json") * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php index 1b5dfd1d2dd..65fe83918d4 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php @@ -17,7 +17,7 @@ class PetFindByStatus { /** * Finds Pets by status - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php index eb22aa3f0a7..0126ada37c0 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php @@ -17,7 +17,7 @@ class PetFindByTags { /** * Finds Pets by tags - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php index 3d39994737d..625bbf5832c 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php @@ -17,7 +17,7 @@ class PetPetId { /** * Deletes a pet - * @PHA\handleDelete + * @PHA\Delete() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class PetPetId } /** * Find pet by ID - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation @@ -47,7 +47,7 @@ class PetPetId } /** * Updates a pet in the store with form data - * @PHA\handlePost + * @PHA\Post() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php index db143c6f752..67cc0784caa 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php @@ -17,7 +17,7 @@ class PetPetIdUploadImage { /** * uploads an image - * @PHA\handlePost + * @PHA\Post() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php index 1596b36f5ca..6d6d3ceb946 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php @@ -17,7 +17,7 @@ class StoreInventory { /** * Returns pet inventories by status - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json") * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php index a777451785d..23623764409 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php @@ -17,7 +17,7 @@ class StoreOrder { /** * Place an order for a pet - * @PHA\handlePost + * @PHA\Post() * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Order::class,"objectAttr":"bodyData"}) * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php index 9618069ea9a..28aa169a0c8 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php @@ -17,7 +17,7 @@ class StoreOrderOrderId { /** * Delete purchase order by ID - * @PHA\handleDelete + * @PHA\Delete() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class StoreOrderOrderId } /** * Find purchase order by ID - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php index c016c23e071..9d3d8ceb9e3 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php @@ -17,7 +17,7 @@ class User { /** * Create user - * @PHA\handlePost + * @PHA\Post() * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) * @param ServerRequestInterface $request * diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php index b0e44209dc7..8ac24b28f2f 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php @@ -17,7 +17,7 @@ class UserCreateWithArray { /** * Creates list of users with given input array - * @PHA\handlePost + * @PHA\Post() * TODO check if attribute is valid and can handle your container type * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"}) * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php index 78532988688..27ccafbb5d2 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php @@ -17,7 +17,7 @@ class UserCreateWithList { /** * Creates list of users with given input array - * @PHA\handlePost + * @PHA\Post() * TODO check if attribute is valid and can handle your container type * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"}) * @param ServerRequestInterface $request diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php index 886b8bb0c3b..2322e8f2317 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php @@ -17,7 +17,7 @@ class UserLogin { /** * Logs user into the system - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php index 3c858e04f80..4c0d8b1bb06 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php @@ -17,7 +17,7 @@ class UserLogout { /** * Logs out current logged in user session - * @PHA\handleGet + * @PHA\Get() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php index fbeea79285d..290bfeb9731 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php @@ -17,7 +17,7 @@ class UserUsername { /** * Delete user - * @PHA\handleDelete + * @PHA\Delete() * @param ServerRequestInterface $request * * @throws PHException\HttpCode 501 if the method is not implemented @@ -29,7 +29,7 @@ class UserUsername } /** * Get user by user name - * @PHA\handleGet + * @PHA\Get() * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml") * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation @@ -47,7 +47,7 @@ class UserUsername } /** * Updated user - * @PHA\handlePut + * @PHA\Put() * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"}) * @param ServerRequestInterface $request * diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index 7af251c4b35..94f1603a5bb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java index c49ea5efc79..42794c669e5 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java @@ -157,7 +157,7 @@ public class EnumTest { private EnumNumberEnum enumNumber; @JsonProperty("outerEnum") - private OuterEnum outerEnum = null; + private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; -- GitLab