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 2 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
// 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.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.function.Supplier;
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<String, 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 Supplier that retrieves the first page.
*/
public PagedIterable(Supplier<PagedResponse<T>> firstPageRetriever) {
this(firstPageRetriever, 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 Supplier that retrieves the first page.
* @param nextPageRetriever Function that retrieves the next page given a continuation token
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
*/
public PagedIterable(Supplier<PagedResponse<T>> firstPageRetriever,
Function<String, PagedResponse<T>> nextPageRetriever) {
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
this.pageRetriever = (continuationToken) -> (continuationToken == null)
? firstPageRetriever.get()
: nextPageRetriever.apply(continuationToken);
}

/**
* {@inheritDoc}
*/
@Override
public Iterator<T> iterator() {
return iterableByItemInternal().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();
}

/**
* Utility function to provide {@link Stream} of value {@code T}.
*
* @return {@link Stream} of value {@code T}.
*/
public Stream<T> stream() {
return StreamSupport.stream(iterableByItemInternal().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.
*
* @return {@link Stream} of a pages
*/
public Stream<PagedResponse<T>> streamByPage() {
return StreamSupport.stream(iterableByPage().spliterator(), false);
}

private Iterable<T> iterableByItemInternal() {
return () -> new PagedByIterator<>(pageRetriever) {

private final Queue<Iterator<T>> pages = new ConcurrentLinkedQueue<>();
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
private volatile Iterator<T> currentPage;

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

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

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

return currentPage.next();
}

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

private Iterable<PagedResponse<T>> iterableByPageInternal() {
return () -> new PagedByIterator<T, PagedResponse<T>>(pageRetriever) {

private final Queue<PagedResponse<T>> pages = new ConcurrentLinkedQueue<>();

@Override
boolean needToRequestPage() {
return pages.peek() == null;
}

@Override
boolean isNextAvailable() {
return pages.peek() != null;
}

@Override
PagedResponse<T> getNext() {
return pages.poll();
}

@Override
void addPage(PagedResponse<T> page) {
this.pages.add(page);
}
};
}

private abstract static class PagedByIterator<T, E> implements Iterator<E> {
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
private static final ClientLogger LOGGER = new ClientLogger(PagedByIterator.class);

private final Function<String, PagedResponse<T>> pageRetriever;
private volatile String continuationToken;
private volatile boolean done;

PagedByIterator(Function<String, PagedResponse<T>> pageRetriever) {
this.pageRetriever = pageRetriever;
}

@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();

synchronized void requestPage() {
AtomicBoolean receivedPages = new AtomicBoolean(false);
PagedResponse<T> page = pageRetriever.apply(continuationToken);
if (page != null) {
receivePage(receivedPages, page);
}
}

abstract void addPage(PagedResponse<T> page);

private void receivePage(AtomicBoolean receivedPages, PagedResponse<T> page) {
receivedPages.set(true);
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
addPage(page);

continuationToken = page.getNextLink();
this.done = continuationToken == null || continuationToken.isEmpty();
}
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package io.clientcore.core.http.models;

import io.clientcore.core.util.binarydata.BinaryData;

import java.io.IOException;
import java.util.List;

/**
* Response of a REST API that returns page.
*
* @see Response
*
* @param <T> The type of items in the page.
*/
public final class PagedResponse<T> implements Response<List<T>> {
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved

private final HttpRequest request;
private final int statusCode;
private final HttpHeaders headers;
private final List<T> items;
private final String nextLink;
private final BinaryData body;

/**
* Creates a new instance of the PagedResponse type.
*
* @param request The HttpRequest that was sent to the service whose response resulted in this response.
* @param statusCode The status code from the response.
* @param headers The headers from the response.
* @param body The body from the response.
* @param items The items returned from the service within the response.
* @param nextLink The next page reference returned from the service, to enable future requests to pick up
* from the same place in the paged iteration.
*/
public PagedResponse(HttpRequest request, int statusCode, HttpHeaders headers, BinaryData body, List<T> items,
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
String nextLink) {
this.request = request;
this.statusCode = statusCode;
this.headers = headers;
this.body = body;
this.items = items;
this.nextLink = nextLink;
}

/**
* Gets the reference to the next page.
*
* @return The next page reference or null if there isn't a next page.
*/
public String getNextLink() {
return nextLink;
}

// TODO
// public String getContinuationToken() {}
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved
// public String getPreviousLink() {}
// public String getFirstLink() {}
// public String getLastLink() {}

/**
* {@inheritDoc}
*/
@Override
public int getStatusCode() {
return statusCode;
}

/**
* {@inheritDoc}
*/
@Override
public HttpHeaders getHeaders() {
return headers;
}

/**
* {@inheritDoc}
*/
@Override
public HttpRequest getRequest() {
return request;
}

/**
* {@inheritDoc}
*/
@Override
public List<T> getValue() {
return items;
}

/**
* {@inheritDoc}
*/
@Override
public BinaryData getBody() {
return body;
}

/**
* {@inheritDoc}
*/
@Override
public void close() throws IOException {
if (body != null) {
body.close();
}
}
}
Loading