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

clientcore, PagedIterable / PagedResponse / PagingOptions #43484

Merged
merged 26 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
31e1095
add a simple PagedIterable
weidongxu-microsoft Dec 18, 2024
d11ddd4
use nextLink
weidongxu-microsoft Dec 19, 2024
1e033c6
Merge branch 'main' into clientcore-paged
weidongxu-microsoft Jan 7, 2025
b830e16
rename PagedByIterator to PagedIterator
weidongxu-microsoft Jan 7, 2025
4f1a534
bug fix on "done" var
weidongxu-microsoft Jan 7, 2025
1d3c09c
add PagingOptions class
weidongxu-microsoft Jan 7, 2025
158a373
add PagedIterableTests
weidongxu-microsoft Jan 7, 2025
ba1e18e
add getContinuationToken in PagedResponse
weidongxu-microsoft Jan 7, 2025
4f33a21
remove concurrency protection
weidongxu-microsoft Jan 8, 2025
74c95f9
[draft] based on PR 43484, put PagingOptions to retriever lambda (#43…
weidongxu-microsoft Jan 9, 2025
93c792e
update ctor for PagedResponse
weidongxu-microsoft Jan 9, 2025
92802f4
minor update in test
weidongxu-microsoft Jan 9, 2025
301753d
fix lint
weidongxu-microsoft Jan 9, 2025
5b30329
Merge branch 'main' into clientcore-paged
weidongxu-microsoft Jan 9, 2025
4e5d662
add UT for PagingOptions
weidongxu-microsoft Jan 9, 2025
dacd61e
add test for PagedResponse
weidongxu-microsoft Jan 9, 2025
89ffa0d
more PagedIterable tests
weidongxu-microsoft Jan 9, 2025
b7b4ad9
test on PagedIterable via continuationToken
weidongxu-microsoft Jan 9, 2025
5ea3918
improve javadoc
weidongxu-microsoft Jan 10, 2025
03b7a4f
allow null for pagingOptions param
weidongxu-microsoft Jan 10, 2025
0c45d9e
more tests on PagedIterable
weidongxu-microsoft Jan 10, 2025
4e8912f
changelog
weidongxu-microsoft Jan 10, 2025
305218a
test case of one page contains 0 items
weidongxu-microsoft Jan 10, 2025
4793e34
improve javadoc
weidongxu-microsoft Jan 10, 2025
0378d59
fix lint
weidongxu-microsoft Jan 10, 2025
05badf9
minor update on PagedIterable ctor
weidongxu-microsoft Jan 10, 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
2 changes: 2 additions & 0 deletions sdk/clientcore/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Features Added

- Added `PagedResponse`, `PagedOptions`, and `PagedIterable`, for supporting pagination.

### Breaking Changes

### Bugs Fixed
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package io.clientcore.core.http.models;

import io.clientcore.core.util.ClientLogger;

import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

/**
* This class provides utility to iterate over {@link PagedResponse} using {@link Stream} and {@link Iterable}
* interfaces.
*
* @param <T> The type of items in the page.
*/
public final class PagedIterable<T> implements Iterable<T> {

private final Function<PagingContext, PagedResponse<T>> pageRetriever;

/**
* Creates an instance of {@link PagedIterable} that consists of only a single page. This constructor takes a {@code
* Supplier} that return the single page of {@code T}.
*
* @param firstPageRetriever Function that retrieves the first page, given paging options.
*/
public PagedIterable(Function<PagingOptions, PagedResponse<T>> firstPageRetriever) {
this(firstPageRetriever, ((pagingOptions, nextLink) -> null));
}

/**
* Creates an instance of {@link PagedIterable}. The constructor takes a {@code Supplier} and {@code Function}. The
* {@code Supplier} returns the first page of {@code T}, the {@code Function} retrieves subsequent pages of {@code
* T}.
*
* @param firstPageRetriever Function that retrieves the first page, given paging options.
* @param nextPageRetriever Function that retrieves the next page, given paging options and next link.
*/
public PagedIterable(Function<PagingOptions, PagedResponse<T>> firstPageRetriever,
BiFunction<PagingOptions, String, PagedResponse<T>> nextPageRetriever) {
this.pageRetriever = context -> (context.getNextLink() == null)
? firstPageRetriever.apply(context.getPagingOptions())
: nextPageRetriever.apply(context.getPagingOptions(), context.getNextLink());
}

/**
* {@inheritDoc}
*/
@Override
public Iterator<T> iterator() {
return iterableByItemInternal(null).iterator();
}

/**
* Retrieve the {@link Iterable}, one page at a time. It will provide same {@link Iterable} of T values from
* starting if called multiple times.
*
* @return {@link Iterable} of a pages
*/
public Iterable<PagedResponse<T>> iterableByPage() {
return iterableByPageInternal(null);
}

/**
* Retrieve the {@link Iterable}, one page at a time. It will provide same {@link Iterable} of pages from
* starting if called multiple times.
*
* @param pagingOptions the paging options
* @return {@link Iterable} of a pages
*/
public Iterable<PagedResponse<T>> iterableByPage(PagingOptions pagingOptions) {
return iterableByPageInternal(pagingOptions);
}

/**
* Retrieve the {@link Stream} of value {@code T}. It will provide same {@link Stream} of T values from
* starting if called multiple times.
*
* @return {@link Stream} of value {@code T}
*/
public Stream<T> stream() {
return StreamSupport.stream(iterableByItemInternal(null).spliterator(), false);
}

/**
* Retrieve the {@link Stream}, one page at a time. It will provide same {@link Stream} of pages from starting if
* called multiple times.
*
* @return {@link Stream} of a pages
*/
public Stream<PagedResponse<T>> streamByPage() {
return StreamSupport.stream(iterableByPage().spliterator(), false);
}

/**
* Retrieve the {@link Stream}, one page at a time. It will provide same {@link Stream} of T values from starting if
* called multiple times.
*
* @param pagingOptions the paging options
* @return {@link Stream} of a pages
*/
public Stream<PagedResponse<T>> streamByPage(PagingOptions pagingOptions) {
return StreamSupport.stream(iterableByPage(pagingOptions).spliterator(), false);
}

private static final class PagingContext {
private final PagingOptions pagingOptions;
private final String nextLink;

private PagingContext(PagingOptions pagingOptions, String nextLink) {
this.pagingOptions = pagingOptions;
this.nextLink = nextLink;
}

private PagingOptions getPagingOptions() {
return pagingOptions;
}

private String getNextLink() {
return nextLink;
}
}

private Iterable<T> iterableByItemInternal(PagingOptions pagingOptions) {
return () -> new PagedIterator<>(pageRetriever, pagingOptions) {

private Iterator<T> nextPage;
private Iterator<T> currentPage;

@Override
boolean needToRequestPage() {
return (currentPage == null || !currentPage.hasNext()) && nextPage == null;
}

@Override
boolean isNextAvailable() {
return (currentPage != null && currentPage.hasNext()) || nextPage != null;
}

@Override
T getNext() {
if ((currentPage == null || !currentPage.hasNext()) && nextPage != null) {
currentPage = nextPage;
nextPage = null;
}

return currentPage.next();
}

@Override
void addPage(PagedResponse<T> page) {
Iterator<T> pageValues = page.getValue().iterator();
if (pageValues.hasNext()) {
nextPage = pageValues;
}
}
};
}

private Iterable<PagedResponse<T>> iterableByPageInternal(PagingOptions pagingOptions) {
return () -> new PagedIterator<T, PagedResponse<T>>(pageRetriever, pagingOptions) {

private PagedResponse<T> nextPage;

@Override
boolean needToRequestPage() {
return nextPage == null;
}

@Override
boolean isNextAvailable() {
return nextPage != null;
}

@Override
PagedResponse<T> getNext() {
PagedResponse<T> currentPage = nextPage;
nextPage = null;
return currentPage;
}

@Override
void addPage(PagedResponse<T> page) {
nextPage = page;
}
};
}

private abstract static class PagedIterator<T, E> implements Iterator<E> {
private static final ClientLogger LOGGER = new ClientLogger(PagedIterator.class);

private final Function<PagingContext, PagedResponse<T>> pageRetriever;
private final Long pageSize;
private String continuationToken;
private String nextLink;
private boolean done;

PagedIterator(Function<PagingContext, PagedResponse<T>> pageRetriever, PagingOptions pagingOptions) {
this.pageRetriever = pageRetriever;
this.pageSize = pagingOptions == null ? null : pagingOptions.getPageSize();
this.continuationToken = pagingOptions == null ? null : pagingOptions.getContinuationToken();
}

@Override
public E next() {
if (!hasNext()) {
throw LOGGER.logThrowableAsError(new NoSuchElementException("Iterator contains no more elements."));
}

return getNext();
}

@Override
public boolean hasNext() {
// Request next pages in a loop in case we are returned empty pages for the by item implementation.
while (!done && needToRequestPage()) {
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
requestPage();
}

return isNextAvailable();
}

abstract boolean needToRequestPage();

abstract boolean isNextAvailable();

abstract E getNext();

void requestPage() {
boolean receivedPages = false;
PagingOptions pagingOptions = new PagingOptions();
pagingOptions.setPageSize(pageSize);
pagingOptions.setContinuationToken(continuationToken);
PagedResponse<T> page = pageRetriever.apply(new PagingContext(pagingOptions, nextLink));
if (page != null) {
receivePage(page);
receivedPages = true;
}

/*
* In the scenario when the subscription completes without emitting an element indicate we are done by checking
* if we have any additional elements to return.
*/
this.done = done || (!receivedPages && !isNextAvailable());
}

abstract void addPage(PagedResponse<T> page);

private void receivePage(PagedResponse<T> page) {
addPage(page);

nextLink = page.getNextLink();
continuationToken = page.getContinuationToken();
this.done = (nextLink == null || nextLink.isEmpty())
&& (continuationToken == null || continuationToken.isEmpty());
}
}
}
Loading
Loading