Skip to content

[http-client-java] Preserve page-size overrides in typed async paging #12163

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
Xiaofei Cao (XiaofeiCao) merged 5 commits into from
Oct 14, 2026
Merged

[http-client-java] Preserve page-size overrides in typed async paging #12163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1a27aa
fix(http-client-java): forward async paging page-size overrides
XiaofeiCao Oct 13, 2026
ba51627
test(http-client-java): regenerate pageable async client
XiaofeiCao Oct 13, 2026
9dfeed7
test(http-client-java): cover async paging with Spector
XiaofeiCao Oct 13, 2026
b80275c
test(http-client-java): retain only Spector paging coverage
XiaofeiCao Oct 13, 2026
d4013cf
test(http-client-java): regenerate paging client fixtures
XiaofeiCao Oct 13, 2026
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
7 changes: 7 additions & 0 deletions .chronus/changes/http-client-java-async-page-size.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: fix
packages:
- "@typespec/http-client-java"
---

Forward page-size overrides from typed asynchronous paging methods to protocol requests.
11 changes: 8 additions & 3 deletions ...icrosoft/typespec/http/client/generator/core/template/ConvenienceAsyncMethodTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,14 @@ && isResponseHeadersAsModel(convenienceMethod)) {

methodBlock.methodReturn(String.format(
"PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {\n"
+ " Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)\n"
+ " ? pagedFluxResponse.byPage().take(1)\n"
+ " : pagedFluxResponse.byPage(continuationTokenParam).take(1);\n"
+ " Flux<PagedResponse<BinaryData>> flux;\n" + " if (pageSizeParam == null) {\n"
+ " flux = (continuationTokenParam == null)\n"
+ " ? pagedFluxResponse.byPage().take(1)\n"
+ " : pagedFluxResponse.byPage(continuationTokenParam).take(1);\n" + " } else {\n"
+ " flux = (continuationTokenParam == null)\n"
+ " ? pagedFluxResponse.byPage(pageSizeParam).take(1)\n"
+ " : pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);\n"
+ " }\n"
+ " return flux.map(pagedResponse -> new PagedResponseBase<Void, %1$s>(pagedResponse.getRequest(),\n"
+ " pagedResponse.getStatusCode(),\n" + " pagedResponse.getHeaders(),\n"
+ " pagedResponse.getValue().stream().map(%2$s).collect(Collectors.toList()),\n"
Expand Down
13 changes: 10 additions & 3 deletions ...r-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,16 @@ public PagedFlux<Test> listItems() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listItems(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, Test>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down
39 changes: 30 additions & 9 deletions ...generator/http-client-generator-test/src/main/java/azure/core/basic/BasicAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,16 @@ public PagedFlux<User> list(Integer top, Integer skip, List<String> orderBy, Str
}
PagedFlux<BinaryData> pagedFluxResponse = listInternal(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -604,9 +611,16 @@ public PagedFlux<User> list() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listInternal(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -675,9 +689,16 @@ public PagedFlux<User> list(Integer top, Integer skip, List<String> orderBy, Str
}
PagedFlux<BinaryData> pagedFluxResponse = listInternal(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down
91 changes: 70 additions & 21 deletions ...a/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,16 @@ public PagedFlux<User> listWithPage() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listWithPage(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -292,9 +299,16 @@ public PagedFlux<User> listWithParameters(ListItemInputBody bodyInput, ListItemI
}
PagedFlux<BinaryData> pagedFluxResponse = listWithParameters(BinaryData.fromObject(bodyInput), requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -324,9 +338,16 @@ public PagedFlux<User> listWithParameters(ListItemInputBody bodyInput) {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listWithParameters(BinaryData.fromObject(bodyInput), requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -354,9 +375,16 @@ public PagedFlux<User> listWithCustomPageModel() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listWithCustomPageModel(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -390,9 +418,16 @@ public PagedFlux<User> withParameterizedNextLink(String select, Boolean includeP
}
PagedFlux<BinaryData> pagedFluxResponse = withParameterizedNextLink(select, requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -422,9 +457,16 @@ public PagedFlux<User> withParameterizedNextLink(String select) {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = withParameterizedNextLink(select, requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -452,9 +494,16 @@ public PagedFlux<User> withRelativeNextLink() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = withRelativeNextLink(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down
26 changes: 20 additions & 6 deletions ...p-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,16 @@ public PagedFlux<FirstItem> listFirstItem() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listFirstItem(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, FirstItem>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down Expand Up @@ -142,9 +149,16 @@ public PagedFlux<SecondItem> listSecondItem() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = listSecondItem(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, SecondItem>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down
13 changes: 10 additions & 3 deletions .../http-client-generator-test/src/main/java/azure/payload/pageable/PageableAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,16 @@ public PagedFlux<User> list() {
RequestOptions requestOptions = new RequestOptions();
PagedFlux<BinaryData> pagedFluxResponse = list(requestOptions);
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
Flux<PagedResponse<BinaryData>> flux;
if (pageSizeParam == null) {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage().take(1)
: pagedFluxResponse.byPage(continuationTokenParam).take(1);
} else {
flux = (continuationTokenParam == null)
? pagedFluxResponse.byPage(pageSizeParam).take(1)
: pagedFluxResponse.byPage(continuationTokenParam, pageSizeParam).take(1);
}
return flux.map(pagedResponse -> new PagedResponseBase<Void, User>(pagedResponse.getRequest(),
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
pagedResponse.getValue()
Expand Down
Loading
Loading