From ef578c8aee81e3683a0c07a156e839232750a6de Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 4 May 2026 12:00:04 +0800 Subject: [PATCH] avoid blank lines in jaxrs-spec quarkus templates --- .../spec/libraries/quarkus/api.mustache | 16 ++++++++++++---- .../spec/libraries/quarkus/apiInterface.mustache | 4 +++- .../gen/java/org/openapitools/api/PetApi.java | 2 -- .../gen/java/org/openapitools/api/StoreApi.java | 2 -- .../gen/java/org/openapitools/api/UserApi.java | 2 -- .../org/openapitools/api/AnotherFakeApi.java | 2 -- .../gen/java/org/openapitools/api/FakeApi.java | 2 -- .../openapitools/api/FakeClassnameTestApi.java | 2 -- .../gen/java/org/openapitools/api/FooApi.java | 2 -- .../gen/java/org/openapitools/api/PetApi.java | 2 -- .../gen/java/org/openapitools/api/StoreApi.java | 2 -- .../gen/java/org/openapitools/api/UserApi.java | 2 -- 12 files changed, 15 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache index b3b6b2c6566c..3af45c8f7829 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache @@ -5,8 +5,14 @@ package {{package}}; import {{javaxPackage}}.ws.rs.*; import {{javaxPackage}}.ws.rs.core.Response; -{{#returnJBossResponse}}import org.jboss.resteasy.reactive.RestResponse;{{/returnJBossResponse}} -{{#interfaceOnly}}{{#hasResponseStatusAnnotations}}import org.jboss.resteasy.reactive.ResponseStatus;{{/hasResponseStatusAnnotations}}{{/interfaceOnly}} +{{#returnJBossResponse}} +import org.jboss.resteasy.reactive.RestResponse; +{{/returnJBossResponse}} +{{#interfaceOnly}} +{{#hasResponseStatusAnnotations}} +import org.jboss.resteasy.reactive.ResponseStatus; +{{/hasResponseStatusAnnotations}} +{{/interfaceOnly}} {{#useGzipFeature}} import org.jboss.resteasy.annotations.GZIP; {{/useGzipFeature}} @@ -34,8 +40,10 @@ import java.util.concurrent.CompletableFuture; import java.io.InputStream; import java.util.Map; import java.util.List; -{{#useBeanValidation}}import {{javaxPackage}}.validation.constraints.*; -import {{javaxPackage}}.validation.Valid;{{/useBeanValidation}} +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; +{{/useBeanValidation}} {{#useMicroProfileOpenAPIAnnotations}}@org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition( info = @org.eclipse.microprofile.openapi.annotations.info.Info( diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache index 9e39bc36c4cc..b79a56fa34e0 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache @@ -50,5 +50,7 @@ {{^vendorExtensions.x-java-is-response-void}}@org.eclipse.microprofile.openapi.annotations.media.Content(schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = {{{baseType}}}.class{{#vendorExtensions.x-microprofile-open-api-return-schema-container}}, type = {{{.}}} {{/vendorExtensions.x-microprofile-open-api-return-schema-container}}{{#vendorExtensions.x-microprofile-open-api-return-unique-items}}, uniqueItems = true {{/vendorExtensions.x-microprofile-open-api-return-unique-items}})){{/vendorExtensions.x-java-is-response-void}} }){{^-last}},{{/-last}}{{/responses}} }){{/hasProduces}}{{/useMicroProfileOpenAPIAnnotations}} - {{#vendorExtensions.x-java-success-response-code}}@ResponseStatus({{{vendorExtensions.x-java-success-response-code}}}){{/vendorExtensions.x-java-success-response-code}} + {{#vendorExtensions.x-java-success-response-code}} + @ResponseStatus({{{vendorExtensions.x-java-success-response-code}}}) + {{/vendorExtensions.x-java-success-response-code}} {{#supportAsync}}{{>returnAsyncTypeInterface}}{{/supportAsync}}{{^supportAsync}}{{#returnJBossResponse}}{{>returnResponseTypeInterface}}{{/returnJBossResponse}}{{^returnJBossResponse}}{{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}}{{/returnJBossResponse}}{{/supportAsync}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>cookieParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}); diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java index c84225e20d88..2fea0b576ffa 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java @@ -9,8 +9,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java index d6ed6b0a5c6d..e9efcbb06834 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java @@ -8,8 +8,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java index 661a7a7a5b72..9e39d613a4a7 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -8,8 +8,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java index b9e1fd296c0c..fa8d9d2ba14d 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -7,8 +7,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java index 9a5cc44cdfa6..d39957ee5ebd 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java @@ -23,8 +23,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index a704509eabb0..cf6eeaa035ab 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -7,8 +7,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FooApi.java index f54353c17e4f..7c1076f0ecfb 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FooApi.java @@ -7,8 +7,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java index 31147ac71b5c..91069f7ec104 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java @@ -10,8 +10,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/StoreApi.java index e60c264c8ff5..ceaa1a81da8a 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/StoreApi.java @@ -8,8 +8,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java index c76b322f7225..455dd88392f7 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java @@ -8,8 +8,6 @@ - - import java.io.InputStream; import java.util.Map; import java.util.List;