Skip to content

Commit aaaf1e1

Browse files
authored
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).
1 parent 45add92 commit aaaf1e1

5 files changed

Lines changed: 23 additions & 4 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,10 @@ public void processOpts() {
203203
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")
204204
.doNotOverwrite());
205205
}
206-
if (!interfaceOnly) {
207-
supportingFiles.add(new SupportingFile("RestApplication.mustache",
208-
(sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java")
206+
207+
supportingFiles.add(new SupportingFile("RestApplication.mustache",
208+
(sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java")
209209
.doNotOverwrite());
210-
}
211210

212211
if(StringUtils.isNotEmpty(openApiSpecFileLocation)) {
213212
int index = openApiSpecFileLocation.lastIndexOf('/');

samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java
44
src/gen/java/org/openapitools/api/FakeApi.java
55
src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
66
src/gen/java/org/openapitools/api/PetApi.java
7+
src/gen/java/org/openapitools/api/RestApplication.java
78
src/gen/java/org/openapitools/api/RestResourceRoot.java
89
src/gen/java/org/openapitools/api/StoreApi.java
910
src/gen/java/org/openapitools/api/UserApi.java
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.openapitools.api;
2+
3+
import javax.ws.rs.ApplicationPath;
4+
import javax.ws.rs.core.Application;
5+
6+
@ApplicationPath(RestResourceRoot.APPLICATION_PATH)
7+
public class RestApplication extends Application {
8+
9+
}

samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java
44
src/gen/java/org/openapitools/api/FakeApi.java
55
src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
66
src/gen/java/org/openapitools/api/PetApi.java
7+
src/gen/java/org/openapitools/api/RestApplication.java
78
src/gen/java/org/openapitools/api/RestResourceRoot.java
89
src/gen/java/org/openapitools/api/StoreApi.java
910
src/gen/java/org/openapitools/api/UserApi.java
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.openapitools.api;
2+
3+
import javax.ws.rs.ApplicationPath;
4+
import javax.ws.rs.core.Application;
5+
6+
@ApplicationPath(RestResourceRoot.APPLICATION_PATH)
7+
public class RestApplication extends Application {
8+
9+
}

0 commit comments

Comments
 (0)