Skip to content

Commit 2bb7296

Browse files
authored
avoid blank lines in jaxrs-spec quarkus templates (#23682)
1 parent 5feda8d commit 2bb7296

12 files changed

Lines changed: 15 additions & 25 deletions

File tree

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ package {{package}};
55

66
import {{javaxPackage}}.ws.rs.*;
77
import {{javaxPackage}}.ws.rs.core.Response;
8-
{{#returnJBossResponse}}import org.jboss.resteasy.reactive.RestResponse;{{/returnJBossResponse}}
9-
{{#interfaceOnly}}{{#hasResponseStatusAnnotations}}import org.jboss.resteasy.reactive.ResponseStatus;{{/hasResponseStatusAnnotations}}{{/interfaceOnly}}
8+
{{#returnJBossResponse}}
9+
import org.jboss.resteasy.reactive.RestResponse;
10+
{{/returnJBossResponse}}
11+
{{#interfaceOnly}}
12+
{{#hasResponseStatusAnnotations}}
13+
import org.jboss.resteasy.reactive.ResponseStatus;
14+
{{/hasResponseStatusAnnotations}}
15+
{{/interfaceOnly}}
1016
{{#useGzipFeature}}
1117
import org.jboss.resteasy.annotations.GZIP;
1218
{{/useGzipFeature}}
@@ -34,8 +40,10 @@ import java.util.concurrent.CompletableFuture;
3440
import java.io.InputStream;
3541
import java.util.Map;
3642
import java.util.List;
37-
{{#useBeanValidation}}import {{javaxPackage}}.validation.constraints.*;
38-
import {{javaxPackage}}.validation.Valid;{{/useBeanValidation}}
43+
{{#useBeanValidation}}
44+
import {{javaxPackage}}.validation.constraints.*;
45+
import {{javaxPackage}}.validation.Valid;
46+
{{/useBeanValidation}}
3947

4048
{{#useMicroProfileOpenAPIAnnotations}}@org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition(
4149
info = @org.eclipse.microprofile.openapi.annotations.info.Info(

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@
5050
{{^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}}
5151
}){{^-last}},{{/-last}}{{/responses}}
5252
}){{/hasProduces}}{{/useMicroProfileOpenAPIAnnotations}}
53-
{{#vendorExtensions.x-java-success-response-code}}@ResponseStatus({{{vendorExtensions.x-java-success-response-code}}}){{/vendorExtensions.x-java-success-response-code}}
53+
{{#vendorExtensions.x-java-success-response-code}}
54+
@ResponseStatus({{{vendorExtensions.x-java-success-response-code}}})
55+
{{/vendorExtensions.x-java-success-response-code}}
5456
{{#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}});

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010

1111

12-
13-
1412
import java.io.InputStream;
1513
import java.util.Map;
1614
import java.util.List;

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99

1010

11-
12-
1311
import java.io.InputStream;
1412
import java.util.Map;
1513
import java.util.List;

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99

1010

11-
12-
1311
import java.io.InputStream;
1412
import java.util.Map;
1513
import java.util.List;

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88

99

10-
11-
1210
import java.io.InputStream;
1311
import java.util.Map;
1412
import java.util.List;

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424

2525

26-
27-
2826
import java.io.InputStream;
2927
import java.util.Map;
3028
import java.util.List;

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88

99

10-
11-
1210
import java.io.InputStream;
1311
import java.util.Map;
1412
import java.util.List;

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FooApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88

99

10-
11-
1210
import java.io.InputStream;
1311
import java.util.Map;
1412
import java.util.List;

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111

1212

13-
14-
1513
import java.io.InputStream;
1614
import java.util.Map;
1715
import java.util.List;

0 commit comments

Comments
 (0)