refactor: rename AsyncResultSet -> AsyncPage for cleaner API

Author: bevzzz

src/main/java/io/weaviate/client6/v1/api/collections/pagination/AsyncPaginator.java

@@ -20,15 +20,15 @@ public class AsyncPaginator<PropertiesT> {
   private final int pageSize;
   private final String cursor;
 
-  private CompletableFuture<AsyncResultSet<PropertiesT>> resultSet;
+  private CompletableFuture<AsyncPage<PropertiesT>> resultSet;
 
   public AsyncPaginator(Builder<PropertiesT> builder) {
     this.query = builder.query;
     this.queryOptions = builder.queryOptions;
     this.pageSize = builder.pageSize;
     this.cursor = builder.cursor;
 
-    var rs = new AsyncResultSet<PropertiesT>(
+    var rs = new AsyncPage<PropertiesT>(
         cursor,
         pageSize,
         (after, limit) -> {
@@ -51,18 +51,18 @@ public CompletableFuture<Void> forPage(Consumer<List<WeaviateObject<PropertiesT,
         .thenCompose(processPageAndAdvance(action));
   }
 
-  public Function<AsyncResultSet<PropertiesT>, CompletableFuture<Void>> processEachAndAdvance(
+  public Function<AsyncPage<PropertiesT>, CompletableFuture<Void>> processEachAndAdvance(
       Consumer<WeaviateObject<PropertiesT, Object, QueryMetadata>> action) {
     return processAndAdvanceFunc(rs -> rs.forEach(action));
   }
 
-  public Function<AsyncResultSet<PropertiesT>, CompletableFuture<Void>> processPageAndAdvance(
+  public Function<AsyncPage<PropertiesT>, CompletableFuture<Void>> processPageAndAdvance(
       Consumer<List<WeaviateObject<PropertiesT, Object, QueryMetadata>>> action) {
-    return processAndAdvanceFunc(rs -> action.accept(rs.currentPage()));
+    return processAndAdvanceFunc(rs -> action.accept(rs.items()));
   }
 
-  public Function<AsyncResultSet<PropertiesT>, CompletableFuture<Void>> processAndAdvanceFunc(
-      Consumer<AsyncResultSet<PropertiesT>> action) {
+  public Function<AsyncPage<PropertiesT>, CompletableFuture<Void>> processAndAdvanceFunc(
+      Consumer<AsyncPage<PropertiesT>> action) {
     return rs -> {
       // Empty result set means there were no more objects to fetch.
       if (rs.isEmpty()) {

src/main/java/io/weaviate/client6/v1/api/collections/pagination/AsyncResultSet.java

@@ -10,24 +10,24 @@
 import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
 
-public class CursorSpliterator<T> implements Spliterator<WeaviateObject<T, Object, QueryMetadata>> {
+public class CursorSpliterator<PropertiesT> implements Spliterator<WeaviateObject<PropertiesT, Object, QueryMetadata>> {
   private final int pageSize;
-  private final BiFunction<String, Integer, List<WeaviateObject<T, Object, QueryMetadata>>> fetch;
+  private final BiFunction<String, Integer, List<WeaviateObject<PropertiesT, Object, QueryMetadata>>> fetch;
 
   // Spliterators do not promise thread-safety, so there's no mechanism
   // to protect access to its internal state.
   private String cursor;
-  private Iterator<WeaviateObject<T, Object, QueryMetadata>> currentPage = Collections.emptyIterator();
+  private Iterator<WeaviateObject<PropertiesT, Object, QueryMetadata>> currentPage = Collections.emptyIterator();
 
   public CursorSpliterator(String cursor, int pageSize,
-      BiFunction<String, Integer, List<WeaviateObject<T, Object, QueryMetadata>>> fetch) {
+      BiFunction<String, Integer, List<WeaviateObject<PropertiesT, Object, QueryMetadata>>> fetch) {
     this.cursor = cursor;
     this.pageSize = pageSize;
     this.fetch = fetch;
   }
 
   @Override
-  public boolean tryAdvance(Consumer<? super WeaviateObject<T, Object, QueryMetadata>> action) {
+  public boolean tryAdvance(Consumer<? super WeaviateObject<PropertiesT, Object, QueryMetadata>> action) {
     // Happy path: there are remaining objects in the current page.
     if (currentPage.hasNext()) {
       action.accept(currentPage.next());
@@ -45,7 +45,7 @@ public boolean tryAdvance(Consumer<? super WeaviateObject<T, Object, QueryMetada
   }
 
   @Override
-  public Spliterator<WeaviateObject<T, Object, QueryMetadata>> trySplit() {
+  public Spliterator<WeaviateObject<PropertiesT, Object, QueryMetadata>> trySplit() {
     // Do not support splitting just now;
     return null;
   }

src/main/java/io/weaviate/client6/v1/api/collections/pagination/CursorSpliterator.java

@@ -16,25 +16,25 @@
 import io.weaviate.client6.v1.api.collections.query.WeaviateQueryClient;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 
-public class Paginator<T> implements Iterable<WeaviateObject<T, Object, QueryMetadata>> {
+public class Paginator<PropertiesT> implements Iterable<WeaviateObject<PropertiesT, Object, QueryMetadata>> {
   static final int DEFAULT_PAGE_SIZE = 100;
 
-  private final WeaviateQueryClient<T> query;
+  private final WeaviateQueryClient<PropertiesT> query;
   private final Function<FetchObjects.Builder, ObjectBuilder<FetchObjects>> queryOptions;
   private final int pageSize;
   private final String cursor;
 
   @Override
-  public Iterator<WeaviateObject<T, Object, QueryMetadata>> iterator() {
+  public Iterator<WeaviateObject<PropertiesT, Object, QueryMetadata>> iterator() {
     return Spliterators.iterator(spliterator());
   }
 
-  public Stream<WeaviateObject<T, Object, QueryMetadata>> stream() {
+  public Stream<WeaviateObject<PropertiesT, Object, QueryMetadata>> stream() {
     return StreamSupport.stream(spliterator(), false);
   }
 
-  public Spliterator<WeaviateObject<T, Object, QueryMetadata>> spliterator() {
-    return new CursorSpliterator<T>(cursor, pageSize,
+  public Spliterator<WeaviateObject<PropertiesT, Object, QueryMetadata>> spliterator() {
+    return new CursorSpliterator<PropertiesT>(cursor, pageSize,
         (after, limit) -> {
           var fn = ObjectBuilder.partial(queryOptions, q -> q.after(after).limit(limit));
           return query.fetchObjects(fn).objects();
@@ -50,7 +50,7 @@ public static <T> Paginator<T> of(WeaviateQueryClient<T> query,
     return fn.apply(new Builder<>(query)).build();
   }
 
-  Paginator(Builder<T> builder) {
+  Paginator(Builder<PropertiesT> builder) {
     this.query = builder.query;
     this.queryOptions = builder.queryOptions;
     this.cursor = builder.cursor;