From aaaf1e14c8fc125545c1916071bffa80218a521c Mon Sep 17 00:00:00 2001 From: Tjeerd Verhagen Date: Wed, 24 Jan 2024 14:37:10 +0100 Subject: [PATCH] Fixes #17645 When interfaceOnly is true, RestApplication will be generated as well (#17646) This class with the optional OpenAPIDefinition annotations is now generated always. And no longer only when the interfaceOnly is set to false (default). --- .../codegen/languages/JavaJAXRSSpecServerCodegen.java | 7 +++---- .../.openapi-generator/FILES | 1 + .../gen/java/org/openapitools/api/RestApplication.java | 9 +++++++++ .../jaxrs-spec-interface/.openapi-generator/FILES | 1 + .../gen/java/org/openapitools/api/RestApplication.java | 9 +++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestApplication.java create mode 100644 samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestApplication.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index d8234cd0b72..69627170d69 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -203,11 +203,10 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen { supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml") .doNotOverwrite()); } - if (!interfaceOnly) { - supportingFiles.add(new SupportingFile("RestApplication.mustache", - (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java") + + supportingFiles.add(new SupportingFile("RestApplication.mustache", + (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java") .doNotOverwrite()); - } if(StringUtils.isNotEmpty(openApiSpecFileLocation)) { int index = openApiSpecFileLocation.lastIndexOf('/'); diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES index f7f670f582e..3ed6ff4d23c 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES @@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java src/gen/java/org/openapitools/api/FakeApi.java src/gen/java/org/openapitools/api/FakeClassnameTestApi.java src/gen/java/org/openapitools/api/PetApi.java +src/gen/java/org/openapitools/api/RestApplication.java src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/UserApi.java diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestApplication.java new file mode 100644 index 00000000000..7df2d0fe333 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestApplication.java @@ -0,0 +1,9 @@ +package org.openapitools.api; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath(RestResourceRoot.APPLICATION_PATH) +public class RestApplication extends Application { + +} diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES index f7f670f582e..3ed6ff4d23c 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES @@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java src/gen/java/org/openapitools/api/FakeApi.java src/gen/java/org/openapitools/api/FakeClassnameTestApi.java src/gen/java/org/openapitools/api/PetApi.java +src/gen/java/org/openapitools/api/RestApplication.java src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/UserApi.java diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestApplication.java new file mode 100644 index 00000000000..7df2d0fe333 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestApplication.java @@ -0,0 +1,9 @@ +package org.openapitools.api; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath(RestResourceRoot.APPLICATION_PATH) +public class RestApplication extends Application { + +}