Remove unnecessary protected modifier from DateTime and set cursorAft…

…er to endCursor where appropriate
googleapis · Feb 2, 2016 · 8dcbff0 · 8dcbff0
1 parent 47d5580
commit 8dcbff0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java
@@ -106,11 +106,11 @@ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
         com.google.protobuf.Timestamp.parseFrom(bytesPb)));
   }
 
-  protected static long timestampPbToMicroseconds(com.google.protobuf.Timestamp timestampPb) {
+  static long timestampPbToMicroseconds(com.google.protobuf.Timestamp timestampPb) {
     return timestampPb.getSeconds() * 1000000 + timestampPb.getNanos() / 1000;
   }
 
-  protected static com.google.protobuf.Timestamp microsecondsToTimestampPb(long microseconds) {
+  static com.google.protobuf.Timestamp microsecondsToTimestampPb(long microseconds) {
     long seconds = microseconds / 1000000;
     int nanos = (int) (microseconds % 1000000) * 1000;
     return com.google.protobuf.Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();

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
@@ -93,6 +93,7 @@ protected T computeNext() {
       sendRequest();
     }
     if (!entityResultPbIter.hasNext()) {
+      cursor = runQueryResponsePb.getBatch().getEndCursor();
       return endOfData();
     }
     com.google.datastore.v1beta3.EntityResult entityResultPb = entityResultPbIter.next();