remove changes to structured query's builder and instead use fromPb in GqlQuery's nextQuery

Author: Ajay Kannan

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GqlQuery.java

@@ -379,12 +379,9 @@ protected void populatePb(com.google.datastore.v1beta3.RunQueryRequest.Builder r
   }
 
   @Override
-  protected StructuredQuery<V> nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) {
-    return new StructuredQuery.Builder<>(type())
-        .namespace(namespace())
-        .mergeFrom(responsePb.getQuery())
-        .prepareNext(responsePb.getBatch())
-        .build();
+  protected Query<V> nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) {
+    return StructuredQuery.<V>fromPb(type(), namespace(), responsePb.getQuery())
+        .nextQuery(responsePb);
   }
 
   @Override

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java

@@ -669,19 +669,6 @@ B mergeFrom(com.google.datastore.v1beta3.Query queryPb) {
       return self();
     }
 
-    B prepareNext(com.google.datastore.v1beta3.QueryResultBatch queryResultBatchPb) {
-      startCursor(new Cursor(queryResultBatchPb.getEndCursor()));
-      if (offset > 0 && queryResultBatchPb.getSkippedResults() < offset) {
-        offset(offset - queryResultBatchPb.getSkippedResults());
-      } else {
-        offset(0);
-        if (limit != null) {
-          limit(limit - queryResultBatchPb.getEntityResultsCount());
-        }
-      }
-      return self();
-    }
-
     public StructuredQuery<V> build() {
       return new StructuredQuery<>(this);
     }
@@ -858,8 +845,19 @@ protected void populatePb(com.google.datastore.v1beta3.RunQueryRequest.Builder r
   }
 
   @Override
-  protected StructuredQuery<V> nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) {
-    return new Builder<>(type()).mergeFrom(toPb()).prepareNext(responsePb.getBatch()).build();
+  protected Query<V> nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) {
+    Builder<V> builder = new Builder<>(type());
+    builder.mergeFrom(toPb());
+    builder.startCursor(new Cursor(responsePb.getBatch().getEndCursor()));
+    if (offset > 0 && responsePb.getBatch().getSkippedResults() < offset) {
+      builder.offset(offset - responsePb.getBatch().getSkippedResults());
+    } else {
+      builder.offset(0);
+      if (limit != null) {
+        builder.limit(limit - responsePb.getBatch().getEntityResultsCount());
+      }
+    }
+    return builder.build();
   }
 
   @Override
@@ -907,7 +905,9 @@ protected Object fromPb(ResultType<V> resultType, String namespace, byte[] bytes
     return fromPb(resultType, namespace, com.google.datastore.v1beta3.Query.parseFrom(bytesPb));
   }
 
-  private static StructuredQuery<?> fromPb(ResultType<?> resultType, String namespace,
+  @SuppressWarnings("unchecked")
+  static <V> StructuredQuery<V> fromPb(
+      ResultType<?> resultType, String namespace,
       com.google.datastore.v1beta3.Query queryPb) {
     BaseBuilder<?, ?> builder;
     if (resultType.equals(ResultType.ENTITY)) {
@@ -917,6 +917,6 @@ private static StructuredQuery<?> fromPb(ResultType<?> resultType, String namesp
     } else {
       builder = new ProjectionEntityQueryBuilder();
     }
-    return builder.namespace(namespace).mergeFrom(queryPb).build();
+    return (StructuredQuery<V>) builder.namespace(namespace).mergeFrom(queryPb).build();
   }
 }