Skip to content
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.

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

fix(java): Send only request body reference for body-only wrapped request #5844

Merged
merged 9 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions fern/pages/changelogs/java-model/2025-02-03.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## 1.5.1
**`(fix):`** Send only request body reference for body-only wrapped request


4 changes: 4 additions & 0 deletions fern/pages/changelogs/java-sdk/2025-02-03.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## 2.11.1
**`(fix):`** Send only request body reference for body-only wrapped request


3 changes: 0 additions & 3 deletions fern/pages/changelogs/ts-express/2025-02-02.mdx

This file was deleted.

7 changes: 7 additions & 0 deletions generators/java/model/versions.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
- changelogEntry:
- summary: |
Send only request body reference for body-only wrapped request
type: fix
createdAt: '2025-2-3'
irVersion: 53
version: 1.5.1
- changelogEntry:
- summary: |
Add deep cursor path pagination support.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,32 @@ public Void visitTypeReference(HttpRequestBodyReference _typeReference) {
.addStatement("$L = $T.create(\"\", null)", getOkhttpRequestBodyName(), RequestBody.class)
.beginControlFlow("if ($N.isPresent())", "request");
}

CodeBlock requestBodyGetter = CodeBlock.of("request");

boolean requestBodyGetterPresent = generatedWrappedRequest != null
&& generatedWrappedRequest.requestBodyGetter().isPresent();

if (clientGeneratorContext.getCustomConfig().inlinePathParameters()
&& requestBodyGetterPresent
&& (generatedWrappedRequest.requestBodyGetter().get()
instanceof GeneratedWrappedRequest.ReferencedRequestBodyGetter)) {
String getterName = ((GeneratedWrappedRequest.ReferencedRequestBodyGetter)
generatedWrappedRequest.requestBodyGetter().get())
.requestBodyGetter()
.name;

requestBodyGetter = CodeBlock.of("request.$L()", getterName);
}

codeBlock
.addStatement(
"$L = $T.create($T.$L.writeValueAsBytes($L), $T.$L)",
getOkhttpRequestBodyName(),
RequestBody.class,
generatedObjectMapper.getClassName(),
generatedObjectMapper.jsonMapperStaticField().name,
"request",
requestBodyGetter,
clientGeneratorContext.getPoetClassNameFactory().getMediaTypesClassName(),
CoreMediaTypesGenerator.APPLICATION_JSON_FIELD_CONSTANT)
.endControlFlow();
Expand Down
7 changes: 7 additions & 0 deletions generators/java/sdk/versions.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
- changelogEntry:
- summary: |
Send only request body reference for body-only wrapped request
type: fix
createdAt: '2025-2-3'
irVersion: 53
version: 2.11.1
- changelogEntry:
- summary: |
Add deep cursor path pagination support.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading