Merge pull request #498 from ajkannan/hide-non-public-refs

aozarov · aozarov · commit 9bcebd3da2bd · 2015-12-21T17:09:09.000-08:00
Make protobuf methods package protected
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseDatastoreBatchWriter.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseDatastoreBatchWriter.java
@@ -199,7 +199,7 @@ protected DatastoreException newInvalidRequest(String msg, Object... params) {
     return DatastoreException.throwInvalidRequest(String.format(msg, params));
   }
 
-  protected DatastoreV1.Mutation.Builder toMutationPb() {
+  DatastoreV1.Mutation.Builder toMutationPb() {
     DatastoreV1.Mutation.Builder mutationPb = DatastoreV1.Mutation.newBuilder();
     for (FullEntity<IncompleteKey> entity : toAddAutoId()) {
       mutationPb.addInsertAutoId(entity.toPb());
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -90,7 +90,7 @@ private B self() {
     }
 
     @SuppressWarnings("unchecked")
-    protected B fill(DatastoreV1.Entity entityPb) {
+    B fill(DatastoreV1.Entity entityPb) {
       Map<String, Value<?>> copiedProperties = Maps.newHashMap();
       for (DatastoreV1.Property property : entityPb.getPropertyList()) {
         copiedProperties.put(property.getName(), Value.fromPb(property.getValue()));
@@ -375,7 +375,7 @@ ImmutableSortedMap<String, Value<?>> properties() {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     Builder<?, ?> builder = emptyBuilder();
     builder.fill(DatastoreV1.Entity.parseFrom(bytesPb));
     return builder.build();
@@ -384,7 +384,7 @@ protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
   protected abstract Builder<?, ?> emptyBuilder();
 
   @Override
-  protected final DatastoreV1.Entity toPb() {
+  final DatastoreV1.Entity toPb() {
     DatastoreV1.Entity.Builder entityPb = DatastoreV1.Entity.newBuilder();
     for (Map.Entry<String, Value<?>> entry : properties.entrySet()) {
       DatastoreV1.Property.Builder propertyPb = DatastoreV1.Property.newBuilder();
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
@@ -172,7 +172,7 @@ public boolean equals(Object obj) {
   }
 
   @Override
-  protected DatastoreV1.Key toPb() {
+  DatastoreV1.Key toPb() {
     DatastoreV1.Key.Builder keyPb = DatastoreV1.Key.newBuilder();
     DatastoreV1.PartitionId.Builder partitionIdPb = DatastoreV1.PartitionId.newBuilder();
     if (projectId != null) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
@@ -147,12 +147,12 @@ public static Blob copyFrom(InputStream input) throws IOException {
   }
 
   @Override
-  protected Value toPb() {
+  Value toPb() {
     return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return new Blob(DatastoreV1.Value.parseFrom(bytesPb).getBlobValue());
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
@@ -102,12 +102,12 @@ public static Cursor copyFrom(byte[] bytes) {
   }
 
   @Override
-  protected Value toPb() {
+  Value toPb() {
     return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(DatastoreV1.Value.parseFrom(bytesPb));
   }
 
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
@@ -98,12 +98,12 @@ public static DateTime copyFrom(Calendar calendar) {
   }
 
   @Override
-  protected Value toPb() {
+  Value toPb() {
     return DatastoreV1.Value.newBuilder().setIntegerValue(timestampMicroseconds).build();
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return new DateTime(DatastoreV1.Value.parseFrom(bytesPb).getIntegerValue());
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GqlQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GqlQuery.java
@@ -126,7 +126,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected DatastoreV1.GqlQueryArg toPb() {
+    DatastoreV1.GqlQueryArg toPb() {
       DatastoreV1.GqlQueryArg.Builder argPb = DatastoreV1.GqlQueryArg.newBuilder();
       if (name != null) {
         argPb.setName(name);
@@ -141,7 +141,7 @@ protected DatastoreV1.GqlQueryArg toPb() {
     }
 
     @Override
-    protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+    Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
       return fromPb(DatastoreV1.GqlQueryArg.parseFrom(bytesPb));
     }
 
@@ -370,7 +370,7 @@ public boolean equals(Object obj) {
   }
 
   @Override
-  protected DatastoreV1.GqlQuery toPb() {
+  DatastoreV1.GqlQuery toPb() {
     DatastoreV1.GqlQuery.Builder queryPb = DatastoreV1.GqlQuery.newBuilder();
     queryPb.setQueryString(queryString);
     queryPb.setAllowLiteral(allowLiteral);
@@ -384,18 +384,18 @@ protected DatastoreV1.GqlQuery toPb() {
   }
 
   @Override
-  protected void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
+  void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
     requestPb.setGqlQuery(toPb());
   }
 
   @Override
-  protected GqlQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {
+  GqlQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {
     // See issue #17
     throw new UnsupportedOperationException("paging for this query is not implemented yet");
   }
 
   @Override
-  protected Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
+  Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
       throws InvalidProtocolBufferException {
     return fromPb(resultType, namespace, DatastoreV1.GqlQuery.parseFrom(bytesPb));
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/IncompleteKey.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/IncompleteKey.java
@@ -54,7 +54,7 @@ public IncompleteKey build() {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(DatastoreV1.Key.parseFrom(bytesPb));
   }
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Key.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Key.java
@@ -164,7 +164,7 @@ public static Key fromUrlSafe(String urlSafe) {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(DatastoreV1.Key.parseFrom(bytesPb));
   }
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/PathElement.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/PathElement.java
@@ -86,7 +86,7 @@ public boolean equals(Object obj) {
   }
 
   @Override
-  protected DatastoreV1.Key.PathElement toPb() {
+  DatastoreV1.Key.PathElement toPb() {
     DatastoreV1.Key.PathElement.Builder pathElementPb = DatastoreV1.Key.PathElement.newBuilder();
     pathElementPb.setKind(kind);
     if (id != null) {
@@ -98,7 +98,7 @@ protected DatastoreV1.Key.PathElement toPb() {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(DatastoreV1.Key.PathElement.parseFrom(bytesPb));
   }
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
@@ -65,7 +65,8 @@ public abstract static class ResultType<V> implements java.io.Serializable {
 
       private static final long serialVersionUID = 1602329532153860907L;
 
-      @Override protected Object convert(DatastoreV1.Entity entityPb) {
+      @Override
+      Object convert(DatastoreV1.Entity entityPb) {
         if (entityPb.getPropertyCount() == 0) {
           if (!entityPb.hasKey()) {
             return null;
@@ -81,7 +82,8 @@ public abstract static class ResultType<V> implements java.io.Serializable {
 
       private static final long serialVersionUID = 7712959777507168274L;
 
-      @Override protected Entity convert(DatastoreV1.Entity entityPb) {
+      @Override
+      Entity convert(DatastoreV1.Entity entityPb) {
         return Entity.fromPb(entityPb);
       }
     };
@@ -91,7 +93,8 @@ public abstract static class ResultType<V> implements java.io.Serializable {
 
       private static final long serialVersionUID = -8514289244104446252L;
 
-      @Override protected Key convert(DatastoreV1.Entity entityPb) {
+      @Override
+      Key convert(DatastoreV1.Entity entityPb) {
         return Key.fromPb(entityPb.getKey());
       }
     };
@@ -102,7 +105,8 @@ public abstract static class ResultType<V> implements java.io.Serializable {
 
           private static final long serialVersionUID = -7591409419690650246L;
 
-          @Override protected ProjectionEntity convert(DatastoreV1.Entity entityPb) {
+          @Override
+          ProjectionEntity convert(DatastoreV1.Entity entityPb) {
             return ProjectionEntity.fromPb(entityPb);
           }
     };
@@ -151,7 +155,7 @@ boolean isAssignableFrom(ResultType<?> otherResultType) {
       return resultClass.isAssignableFrom(otherResultType.resultClass);
     }
 
-    protected abstract V convert(DatastoreV1.Entity entityPb);
+    abstract V convert(DatastoreV1.Entity entityPb);
 
     static ResultType<?> fromPb(DatastoreV1.EntityResult.ResultType typePb) {
       return MoreObjects.firstNonNull(PB_TO_INSTANCE.get(typePb), UNKNOWN);
@@ -181,16 +185,16 @@ public String toString() {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(resultType, namespace, bytesPb);
   }
 
-  protected abstract Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
+  abstract Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
       throws InvalidProtocolBufferException;
 
-  protected abstract void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb);
+  abstract void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb);
 
-  protected abstract Query<V> nextQuery(DatastoreV1.QueryResultBatch responsePb);
+  abstract Query<V> nextQuery(DatastoreV1.QueryResultBatch responsePb);
 
   /**
    * Returns a new {@link GqlQuery} builder.
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Serializable.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Serializable.java
@@ -46,7 +46,7 @@ private void readObject(ObjectInputStream input) throws IOException, ClassNotFou
     bytesPb = (byte[]) input.readObject();
   }
 
-  protected Object readResolve() throws ObjectStreamException {
+  Object readResolve() throws ObjectStreamException {
     try {
       return fromPb(bytesPb);
     } catch (InvalidProtocolBufferException ex) {
@@ -58,7 +58,7 @@ protected Object readResolve() throws ObjectStreamException {
     }
   }
 
-  protected abstract M toPb();
+  abstract M toPb();
 
-  protected abstract Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException;
+  abstract Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException;
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -103,7 +103,7 @@ public abstract static class Filter implements Serializable {
     Filter() {
     }
 
-    protected abstract DatastoreV1.Filter toPb();
+    abstract DatastoreV1.Filter toPb();
 
     static Filter fromPb(DatastoreV1.Filter filterPb) {
       if (filterPb.hasCompositeFilter()) {
@@ -186,7 +186,7 @@ public static CompositeFilter and(Filter first, Filter... other) {
     }
 
     @Override
-    protected DatastoreV1.Filter toPb() {
+    DatastoreV1.Filter toPb() {
       DatastoreV1.Filter.Builder filterPb = DatastoreV1.Filter.newBuilder();
       DatastoreV1.CompositeFilter.Builder compositeFilterPb = filterPb.getCompositeFilterBuilder();
       compositeFilterPb.setOperator(operator.toPb());
@@ -231,7 +231,7 @@ private PropertyFilter(String property, Operator operator, Value<?> value) {
       this.value = checkNotNull(value);
     }
 
-    public static PropertyFilter fromPb(DatastoreV1.PropertyFilter propertyFilterPb) {
+    static PropertyFilter fromPb(DatastoreV1.PropertyFilter propertyFilterPb) {
       String property = propertyFilterPb.getProperty().getName();
       Operator operator = Operator.fromPb(propertyFilterPb.getOperator());
       Value<?> value = Value.fromPb(propertyFilterPb.getValue());
@@ -435,7 +435,7 @@ public static PropertyFilter isNull(String property) {
     }
 
     @Override
-    protected DatastoreV1.Filter toPb() {
+    DatastoreV1.Filter toPb() {
       DatastoreV1.Filter.Builder filterPb = DatastoreV1.Filter.newBuilder();
       DatastoreV1.PropertyFilter.Builder propertyFilterPb = filterPb.getPropertyFilterBuilder();
       propertyFilterPb.getPropertyBuilder().setName(property);
@@ -587,7 +587,7 @@ DatastoreV1.PropertyExpression toPb() {
       return expressionPb.build();
     }
 
-    public static Projection fromPb(DatastoreV1.PropertyExpression propertyExpressionPb) {
+    static Projection fromPb(DatastoreV1.PropertyExpression propertyExpressionPb) {
       String property = propertyExpressionPb.getProperty().getName();
       Aggregate aggregate = null;
       if (propertyExpressionPb.hasAggregationFunction()) {
@@ -795,7 +795,7 @@ public static final class KeyQueryBuilder extends BaseBuilder<Key, KeyQueryBuild
     }
 
     @Override
-    protected KeyQueryBuilder mergeFrom(DatastoreV1.Query queryPb) {
+    KeyQueryBuilder mergeFrom(DatastoreV1.Query queryPb) {
       super.mergeFrom(queryPb);
       projection(Projection.property(KEY_PROPERTY_NAME));
       clearGroupBy();
@@ -948,12 +948,12 @@ public Integer limit() {
   }
 
   @Override
-  protected void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
+  void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
     requestPb.setQuery(toPb());
   }
 
   @Override
-  protected StructuredQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {
+  StructuredQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {
     Builder<V> builder = new Builder<>(type());
     builder.mergeFrom(toPb());
     builder.startCursor(new Cursor(responsePb.getEndCursor()));
@@ -969,7 +969,7 @@ protected StructuredQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb)
   }
 
   @Override
-  protected DatastoreV1.Query toPb() {
+  DatastoreV1.Query toPb() {
     DatastoreV1.Query.Builder queryPb = DatastoreV1.Query.newBuilder();
     if (kind != null) {
       queryPb.addKindBuilder().setName(kind);
@@ -1002,7 +1002,7 @@ protected DatastoreV1.Query toPb() {
   }
 
   @Override
-  protected Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
+  Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)
       throws InvalidProtocolBufferException {
     return fromPb(resultType, namespace, DatastoreV1.Query.parseFrom(bytesPb));
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Value.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Value.java
@@ -211,7 +211,7 @@ public boolean equals(Object obj) {
 
   @Override
   @SuppressWarnings("unchecked")
-  protected DatastoreV1.Value toPb() {
+  DatastoreV1.Value toPb() {
     return type().getMarshaller().toProto(this);
   }
 
@@ -231,7 +231,7 @@ static Value<?> fromPb(DatastoreV1.Value proto) {
   }
 
   @Override
-  protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
+  Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     return fromPb(DatastoreV1.Value.parseFrom(bytesPb));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ protected DatastoreException newInvalidRequest(String msg, Object... params) {`
`199`	`199`	`return DatastoreException.throwInvalidRequest(String.format(msg, params));`
`200`	`200`	`}`
`201`	`201`
`202`		`- protected DatastoreV1.Mutation.Builder toMutationPb() {`
	`202`	`+ DatastoreV1.Mutation.Builder toMutationPb() {`
`203`	`203`	`DatastoreV1.Mutation.Builder mutationPb = DatastoreV1.Mutation.newBuilder();`
`204`	`204`	`for (FullEntity<IncompleteKey> entity : toAddAutoId()) {`
`205`	`205`	`mutationPb.addInsertAutoId(entity.toPb());`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public boolean equals(Object obj) {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`@Override`
`175`		`- protected DatastoreV1.Key toPb() {`
	`175`	`+ DatastoreV1.Key toPb() {`
`176`	`176`	`DatastoreV1.Key.Builder keyPb = DatastoreV1.Key.newBuilder();`
`177`	`177`	`DatastoreV1.PartitionId.Builder partitionIdPb = DatastoreV1.PartitionId.newBuilder();`
`178`	`178`	`if (projectId != null) {`
Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,12 @@ public static Blob copyFrom(InputStream input) throws IOException {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`@Override`
`150`		`- protected Value toPb() {`
	`150`	`+ Value toPb() {`
`151`	`151`	`return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Override`
`155`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`155`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`156`	`156`	`return new Blob(DatastoreV1.Value.parseFrom(bytesPb).getBlobValue());`
`157`	`157`	`}`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,12 @@ public static Cursor copyFrom(byte[] bytes) {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`@Override`
`105`		`- protected Value toPb() {`
	`105`	`+ Value toPb() {`
`106`	`106`	`return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Override`
`110`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`110`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`111`	`111`	`return fromPb(DatastoreV1.Value.parseFrom(bytesPb));`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,12 @@ public static DateTime copyFrom(Calendar calendar) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- protected Value toPb() {`
	`101`	`+ Value toPb() {`
`102`	`102`	`return DatastoreV1.Value.newBuilder().setIntegerValue(timestampMicroseconds).build();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override`
`106`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`106`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`107`	`107`	`return new DateTime(DatastoreV1.Value.parseFrom(bytesPb).getIntegerValue());`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public boolean equals(Object obj) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Override`
`129`		`- protected DatastoreV1.GqlQueryArg toPb() {`
	`129`	`+ DatastoreV1.GqlQueryArg toPb() {`
`130`	`130`	`DatastoreV1.GqlQueryArg.Builder argPb = DatastoreV1.GqlQueryArg.newBuilder();`
`131`	`131`	`if (name != null) {`
`132`	`132`	`argPb.setName(name);`
`@@ -141,7 +141,7 @@ protected DatastoreV1.GqlQueryArg toPb() {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Override`
`144`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`144`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`145`	`145`	`return fromPb(DatastoreV1.GqlQueryArg.parseFrom(bytesPb));`
`146`	`146`	`}`
`147`	`147`
`@@ -370,7 +370,7 @@ public boolean equals(Object obj) {`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`@Override`
`373`		`- protected DatastoreV1.GqlQuery toPb() {`
	`373`	`+ DatastoreV1.GqlQuery toPb() {`
`374`	`374`	`DatastoreV1.GqlQuery.Builder queryPb = DatastoreV1.GqlQuery.newBuilder();`
`375`	`375`	`queryPb.setQueryString(queryString);`
`376`	`376`	`queryPb.setAllowLiteral(allowLiteral);`
`@@ -384,18 +384,18 @@ protected DatastoreV1.GqlQuery toPb() {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`@Override`
`387`		`- protected void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {`
	`387`	`+ void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {`
`388`	`388`	`requestPb.setGqlQuery(toPb());`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`@Override`
`392`		`- protected GqlQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {`
	`392`	`+ GqlQuery<V> nextQuery(DatastoreV1.QueryResultBatch responsePb) {`
`393`	`393`	`// See issue #17`
`394`	`394`	`throw new UnsupportedOperationException("paging for this query is not implemented yet");`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`@Override`
`398`		`- protected Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)`
	`398`	`+ Object fromPb(ResultType<V> resultType, String namespace, byte[] bytesPb)`
`399`	`399`	`throws InvalidProtocolBufferException {`
`400`	`400`	`return fromPb(resultType, namespace, DatastoreV1.GqlQuery.parseFrom(bytesPb));`
`401`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public IncompleteKey build() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`57`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`58`	`58`	`return fromPb(DatastoreV1.Key.parseFrom(bytesPb));`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public static Key fromUrlSafe(String urlSafe) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`@Override`
`167`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`167`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`168`	`168`	`return fromPb(DatastoreV1.Key.parseFrom(bytesPb));`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public boolean equals(Object obj) {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- protected DatastoreV1.Key.PathElement toPb() {`
	`89`	`+ DatastoreV1.Key.PathElement toPb() {`
`90`	`90`	`DatastoreV1.Key.PathElement.Builder pathElementPb = DatastoreV1.Key.PathElement.newBuilder();`
`91`	`91`	`pathElementPb.setKind(kind);`
`92`	`92`	`if (id != null) {`
`@@ -98,7 +98,7 @@ protected DatastoreV1.Key.PathElement toPb() {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
	`101`	`+ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`102`	`102`	`return fromPb(DatastoreV1.Key.PathElement.parseFrom(bytesPb));`
`103`	`103`	`}`
`104`	`104`