Skip to content

Fixes an issue where the generated REST client was missing a comma #1170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2025
Merged

Fixes an issue where the generated REST client was missing a comma #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
314cb0d
Fixes an issue where the generated REST client was missing a comma
dellamas Jun 4, 2025
eb2299d
test: add test to ensure additionalRequestArgs are generated when len…
dellamas Jun 5, 2025
7489650
Merge branch 'quarkiverse:main' into fix/missing-comma-dynamic-url-args-
dellamas Jun 5, 2025
fecbd87
test: add test to ensure additionalRequestArgs are generated when len…
dellamas Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions client/deployment/src/main/resources/templates/libraries/microprofile/api.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,13 @@ public interface {classname} {
{/if}
{/if}
{/if}
{#if additionalRequestArgs}
{#for arg in additionalRequestArgs}{!
!}{arg}{#if arg_hasNext}, {/if}{/for}{!
!}{#if op.allParams || op.hasFormParams},{/if}
{#if additionalRequestArgs && additionalRequestArgs.length > 0}
{#for arg in additionalRequestArgs}{arg}{#if arg_hasNext}, {/if}{/for}
{#if (op.allParams || op.hasFormParams)}, {/if}
{/if}
{#if is-resteasy-reactive && use-dynamic-url}
// See https://quarkus.io/version/3.20/guides/rest-client#dynamic-base-urls
@io.quarkus.rest.client.reactive.Url String dynUrl{#if op.allParams || op.hasFormParams},{/if}
// See https://quarkus.io/version/3.20/guides/rest-client#dynamic-base-urls
@io.quarkus.rest.client.reactive.Url String dynUrl{#if op.allParams || op.hasFormParams},{/if}
{/if}
{#if op.hasFormParams}
{#if is-resteasy-reactive}
Expand Down
22 changes: 22 additions & 0 deletions ...o/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,28 @@ void verifyAdditionalRequestArgs() throws URISyntaxException {
.forEach(this::verifyApiAdditionalHTTPHeaders);
}

@Test
void shouldGenerateAdditionalParametersWhenLengthGreaterThanZero() throws Exception {
List<File> generatedFiles = createGeneratorWrapper("petstore-openapi.json")
.withAdditionalRequestArgs("@HeaderParam(\"X-Test\") String testHeader;@PathParam(\"id\") String id")
.generate("org.test.additionalargs");

Optional<File> file = generatedFiles.stream()
.filter(f -> f.getName().endsWith("PetApi.java"))
.findAny();
assertThat(file).isNotEmpty();

CompilationUnit compilationUnit = StaticJavaParser.parse(file.orElseThrow());
List<MethodDeclaration> methods = compilationUnit.findAll(MethodDeclaration.class);

boolean found = methods.stream()
.anyMatch(m -> m.getParameters().stream().anyMatch(
p -> p.getNameAsString().equals("testHeader") && p.getAnnotationByName("HeaderParam").isPresent()) &&
m.getParameters().stream().anyMatch(
p -> p.getNameAsString().equals("id") && p.getAnnotationByName("PathParam").isPresent()));
assertTrue(found, "Additional parameters must be generated when additionalRequestArgs.length > 0");
}

@Test
void verifyCookieParams() throws URISyntaxException {
List<File> generatedFiles = createGeneratorWrapper("petstore-openapi.json").generate("org.cookieParams");
Expand Down