Make protobuf methods package protected

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());

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();

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) {

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());
   }
 }

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

@@ -40,12 +40,12 @@ public Builder newBuilder(Blob value) {
         }
 
         @Override
-        protected Blob getValue(DatastoreV1.Value from) {
+        Blob getValue(DatastoreV1.Value from) {
           return new Blob(from.getBlobValue());
         }
 
         @Override
-        protected void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
+        void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
           to.setBlobValue(from.get().byteString());
         }
       };

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

@@ -40,12 +40,12 @@ public Builder newBuilder(Boolean value) {
         }
 
         @Override
-        protected Boolean getValue(DatastoreV1.Value from) {
+        Boolean getValue(DatastoreV1.Value from) {
           return from.getBooleanValue();
         }
 
         @Override
-        protected void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
+        void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
           to.setBooleanValue(from.get());
         }
       };

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));
   }
 

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());
   }
 }

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

@@ -40,12 +40,12 @@ public Builder newBuilder(DateTime value) {
         }
 
         @Override
-        protected DateTime getValue(DatastoreV1.Value from) {
+        DateTime getValue(DatastoreV1.Value from) {
           return new DateTime(from.getTimestampMicrosecondsValue());
         }
 
         @Override
-        protected void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
+        void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
           to.setTimestampMicrosecondsValue(from.get().timestampMicroseconds());
         }
       };

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

@@ -40,12 +40,12 @@ public Builder newBuilder(Double value) {
         }
 
         @Override
-        protected Double getValue(DatastoreV1.Value from) {
+        Double getValue(DatastoreV1.Value from) {
           return from.getDoubleValue();
         }
 
         @Override
-        protected void setValue(DoubleValue from, DatastoreV1.Value.Builder to) {
+        void setValue(DoubleValue from, DatastoreV1.Value.Builder to) {
           to.setDoubleValue(from.get());
         }
       };

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

@@ -41,12 +41,12 @@ public Builder newBuilder(FullEntity<?> value) {
         }
 
         @Override
-        protected FullEntity<?> getValue(DatastoreV1.Value from) {
+        FullEntity<?> getValue(DatastoreV1.Value from) {
           return FullEntity.fromPb(from.getEntityValue());
         }
 
         @Override
-        protected void setValue(EntityValue from, DatastoreV1.Value.Builder to) {
+        void setValue(EntityValue from, DatastoreV1.Value.Builder to) {
           to.setEntityValue(from.get().toPb());
         }
       };

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));
   }

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));
   }
 

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));
   }
 

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

@@ -40,12 +40,12 @@ public Builder newBuilder(Key key) {
         }
 
         @Override
-        protected Key getValue(DatastoreV1.Value from) {
+        Key getValue(DatastoreV1.Value from) {
           return Key.fromPb(from.getKeyValue());
         }
 
         @Override
-        protected void setValue(KeyValue from, DatastoreV1.Value.Builder to) {
+        void setValue(KeyValue from, DatastoreV1.Value.Builder to) {
           to.setKeyValue(from.get().toPb());
         }
       };

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

@@ -45,7 +45,7 @@ public Builder newBuilder(List<? extends Value<?>> values) {
         }
 
         @Override
-        protected List<Value<?>> getValue(DatastoreV1.Value from) {
+        List<Value<?>> getValue(DatastoreV1.Value from) {
           List<Value<?>> properties = new ArrayList<>(from.getListValueCount());
           for (DatastoreV1.Value valuePb : from.getListValueList()) {
             properties.add(Value.fromPb(valuePb));
@@ -54,7 +54,7 @@ protected List<Value<?>> getValue(DatastoreV1.Value from) {
         }
 
         @Override
-        protected void setValue(ListValue from, DatastoreV1.Value.Builder to) {
+        void setValue(ListValue from, DatastoreV1.Value.Builder to) {
           for (Value<?> property : from.get()) {
             to.addListValue(property.toPb());
           }

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

@@ -40,12 +40,12 @@ public Builder newBuilder(Long value) {
         }
 
         @Override
-        protected Long getValue(DatastoreV1.Value from) {
+        Long getValue(DatastoreV1.Value from) {
           return from.getIntegerValue();
         }
 
         @Override
-        protected void setValue(LongValue from, DatastoreV1.Value.Builder to) {
+        void setValue(LongValue from, DatastoreV1.Value.Builder to) {
           to.setIntegerValue(from.get());
         }
       };

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

@@ -40,12 +40,12 @@ public int getProtoFieldId() {
         }
 
         @Override
-        protected Void getValue(DatastoreV1.Value from) {
+        Void getValue(DatastoreV1.Value from) {
           return null;
         }
 
         @Override
-        protected void setValue(NullValue from, DatastoreV1.Value.Builder to) {
+        void setValue(NullValue from, DatastoreV1.Value.Builder to) {
           // nothing to set
         }
       };

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));
   }
 

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.

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

@@ -38,12 +38,12 @@ public int getProtoFieldId() {
         }
 
         @Override
-        protected DatastoreV1.Value getValue(DatastoreV1.Value from) {
+        DatastoreV1.Value getValue(DatastoreV1.Value from) {
           return from;
         }
 
         @Override
-        protected void setValue(RawValue from, DatastoreV1.Value.Builder to) {
+        void setValue(RawValue from, DatastoreV1.Value.Builder to) {
           to.mergeFrom(from.get());
         }
       };