minor fixes to afterCursor + test

Ajay Kannan · Ajay Kannan · commit 2219c82af219 · 2016-01-13T22:08:05.000-08:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -35,9 +35,8 @@ public interface QueryResults<V> extends Iterator<V> {
   Class<?> resultClass();
 
   /**
-   * Returns the Cursor for the point after the value returned in the last {@link #next} call. Until
-   * v1beta3 is supported, this field should only be used if you have set a limit and the number of
-   * results is equal to that limit.
+   * Returns the Cursor for the point after the value returned in the last {@link #next} call.
+   * Currently, {@code cursorAfter} returns null in all cases but the last result.
    */
   Cursor cursorAfter();
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -100,6 +100,9 @@ public Class<?> resultClass() {
   @Override
   public Cursor cursorAfter() {
     //return new Cursor(cursor); // only available in v1beta3
-    return new Cursor(queryResultBatchPb.getEndCursor());
+    if (!hasNext()) {
+      return new Cursor(queryResultBatchPb.getEndCursor());
+    }
+    return null;
   }
 }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -478,7 +478,7 @@ public void testQueryPaginationWithLimit() throws DatastoreRpcException {
     }
     EasyMock.replay(rpcFactoryMock, rpcMock);
     Datastore mockDatastore =
-        this.options.toBuilder()
+        options.toBuilder()
             .retryParams(RetryParams.defaultInstance())
             .serviceRpcFactory(rpcFactoryMock)
             .build()

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,9 @@ public Class<?> resultClass() {`
`100`	`100`	`@Override`
`101`	`101`	`public Cursor cursorAfter() {`
`102`	`102`	`//return new Cursor(cursor); // only available in v1beta3`
`103`		`- return new Cursor(queryResultBatchPb.getEndCursor());`
	`103`	`+ if (!hasNext()) {`
	`104`	`+ return new Cursor(queryResultBatchPb.getEndCursor());`
	`105`	`+ }`
	`106`	`+ return null;`
`104`	`107`	`}`
`105`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ public void testQueryPaginationWithLimit() throws DatastoreRpcException {`
`478`	`478`	`}`
`479`	`479`	`EasyMock.replay(rpcFactoryMock, rpcMock);`
`480`	`480`	`Datastore mockDatastore =`
`481`		`- this.options.toBuilder()`
	`481`	`+ options.toBuilder()`
`482`	`482`	`.retryParams(RetryParams.defaultInstance())`
`483`	`483`	`.serviceRpcFactory(rpcFactoryMock)`
`484`	`484`	`.build()`