revert unnecessary changes in scope in BaseMarshaller

Ajay Kannan · Ajay Kannan · commit b2d181f98076 · 2015-12-21T16:53:41.000-08:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BlobValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BlobValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(Blob value) {
         }
 
         @Override
-        Blob getValue(DatastoreV1.Value from) {
+        protected Blob getValue(DatastoreV1.Value from) {
           return new Blob(from.getBlobValue());
         }
 
         @Override
-        void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
           to.setBlobValue(from.get().byteString());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BooleanValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BooleanValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(Boolean value) {
         }
 
         @Override
-        Boolean getValue(DatastoreV1.Value from) {
+        protected Boolean getValue(DatastoreV1.Value from) {
           return from.getBooleanValue();
         }
 
         @Override
-        void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
           to.setBooleanValue(from.get());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTimeValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTimeValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(DateTime value) {
         }
 
         @Override
-        DateTime getValue(DatastoreV1.Value from) {
+        protected DateTime getValue(DatastoreV1.Value from) {
           return new DateTime(from.getTimestampMicrosecondsValue());
         }
 
         @Override
-        void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
           to.setTimestampMicrosecondsValue(from.get().timestampMicroseconds());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DoubleValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DoubleValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(Double value) {
         }
 
         @Override
-        Double getValue(DatastoreV1.Value from) {
+        protected Double getValue(DatastoreV1.Value from) {
           return from.getDoubleValue();
         }
 
         @Override
-        void setValue(DoubleValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(DoubleValue from, DatastoreV1.Value.Builder to) {
           to.setDoubleValue(from.get());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityValue.java
@@ -41,12 +41,12 @@ public Builder newBuilder(FullEntity<?> value) {
         }
 
         @Override
-        FullEntity<?> getValue(DatastoreV1.Value from) {
+        protected FullEntity<?> getValue(DatastoreV1.Value from) {
           return FullEntity.fromPb(from.getEntityValue());
         }
 
         @Override
-        void setValue(EntityValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(EntityValue from, DatastoreV1.Value.Builder to) {
           to.setEntityValue(from.get().toPb());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(Key key) {
         }
 
         @Override
-        Key getValue(DatastoreV1.Value from) {
+        protected Key getValue(DatastoreV1.Value from) {
           return Key.fromPb(from.getKeyValue());
         }
 
         @Override
-        void setValue(KeyValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(KeyValue from, DatastoreV1.Value.Builder to) {
           to.setKeyValue(from.get().toPb());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ListValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ListValue.java
@@ -45,7 +45,7 @@ public Builder newBuilder(List<? extends Value<?>> values) {
         }
 
         @Override
-        List<Value<?>> getValue(DatastoreV1.Value from) {
+        protected 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 @@ List<Value<?>> getValue(DatastoreV1.Value from) {
         }
 
         @Override
-        void setValue(ListValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(ListValue from, DatastoreV1.Value.Builder to) {
           for (Value<?> property : from.get()) {
             to.addListValue(property.toPb());
           }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/LongValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/LongValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(Long value) {
         }
 
         @Override
-        Long getValue(DatastoreV1.Value from) {
+        protected Long getValue(DatastoreV1.Value from) {
           return from.getIntegerValue();
         }
 
         @Override
-        void setValue(LongValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(LongValue from, DatastoreV1.Value.Builder to) {
           to.setIntegerValue(from.get());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/NullValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/NullValue.java
@@ -40,12 +40,12 @@ public int getProtoFieldId() {
         }
 
         @Override
-        Void getValue(DatastoreV1.Value from) {
+        protected Void getValue(DatastoreV1.Value from) {
           return null;
         }
 
         @Override
-        void setValue(NullValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(NullValue from, DatastoreV1.Value.Builder to) {
           // nothing to set
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/RawValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/RawValue.java
@@ -38,12 +38,12 @@ public int getProtoFieldId() {
         }
 
         @Override
-        DatastoreV1.Value getValue(DatastoreV1.Value from) {
+        protected DatastoreV1.Value getValue(DatastoreV1.Value from) {
           return from;
         }
 
         @Override
-        void setValue(RawValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(RawValue from, DatastoreV1.Value.Builder to) {
           to.mergeFrom(from.get());
         }
       };
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StringValue.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StringValue.java
@@ -40,12 +40,12 @@ public Builder newBuilder(String value) {
         }
 
         @Override
-        String getValue(DatastoreV1.Value from) {
+        protected String getValue(DatastoreV1.Value from) {
           return from.getStringValue();
         }
 
         @Override
-        void setValue(StringValue from, DatastoreV1.Value.Builder to) {
+        protected void setValue(StringValue from, DatastoreV1.Value.Builder to) {
           to.setStringValue(from.get());
         }
       };
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
@@ -80,9 +80,9 @@ public final DatastoreV1.Value toProto(P value) {
       return builder.build();
     }
 
-    abstract V getValue(DatastoreV1.Value from);
+    protected abstract V getValue(DatastoreV1.Value from);
 
-    abstract void setValue(P from, DatastoreV1.Value.Builder to);
+    protected abstract void setValue(P from, DatastoreV1.Value.Builder to);
   }
 
   @SuppressWarnings("deprecation")

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public Builder newBuilder(Blob value) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- Blob getValue(DatastoreV1.Value from) {`
	`43`	`+ protected Blob getValue(DatastoreV1.Value from) {`
`44`	`44`	`return new Blob(from.getBlobValue());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- void setValue(BlobValue from, DatastoreV1.Value.Builder to) {`
	`48`	`+ protected void setValue(BlobValue from, DatastoreV1.Value.Builder to) {`
`49`	`49`	`to.setBlobValue(from.get().byteString());`
`50`	`50`	`}`
`51`	`51`	`};`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ public Builder newBuilder(FullEntity<?> value) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`
`44`		`- FullEntity<?> getValue(DatastoreV1.Value from) {`
	`44`	`+ protected FullEntity<?> getValue(DatastoreV1.Value from) {`
`45`	`45`	`return FullEntity.fromPb(from.getEntityValue());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
`49`		`- void setValue(EntityValue from, DatastoreV1.Value.Builder to) {`
	`49`	`+ protected void setValue(EntityValue from, DatastoreV1.Value.Builder to) {`
`50`	`50`	`to.setEntityValue(from.get().toPb());`
`51`	`51`	`}`
`52`	`52`	`};`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public Builder newBuilder(List<? extends Value<?>> values) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- List<Value<?>> getValue(DatastoreV1.Value from) {`
	`48`	`+ protected List<Value<?>> getValue(DatastoreV1.Value from) {`
`49`	`49`	`List<Value<?>> properties = new ArrayList<>(from.getListValueCount());`
`50`	`50`	`for (DatastoreV1.Value valuePb : from.getListValueList()) {`
`51`	`51`	`properties.add(Value.fromPb(valuePb));`
`@@ -54,7 +54,7 @@ List<Value<?>> getValue(DatastoreV1.Value from) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- void setValue(ListValue from, DatastoreV1.Value.Builder to) {`
	`57`	`+ protected void setValue(ListValue from, DatastoreV1.Value.Builder to) {`
`58`	`58`	`for (Value<?> property : from.get()) {`
`59`	`59`	`to.addListValue(property.toPb());`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public int getProtoFieldId() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- Void getValue(DatastoreV1.Value from) {`
	`43`	`+ protected Void getValue(DatastoreV1.Value from) {`
`44`	`44`	`return null;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- void setValue(NullValue from, DatastoreV1.Value.Builder to) {`
	`48`	`+ protected void setValue(NullValue from, DatastoreV1.Value.Builder to) {`
`49`	`49`	`// nothing to set`
`50`	`50`	`}`
`51`	`51`	`};`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ public int getProtoFieldId() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- DatastoreV1.Value getValue(DatastoreV1.Value from) {`
	`41`	`+ protected DatastoreV1.Value getValue(DatastoreV1.Value from) {`
`42`	`42`	`return from;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- void setValue(RawValue from, DatastoreV1.Value.Builder to) {`
	`46`	`+ protected void setValue(RawValue from, DatastoreV1.Value.Builder to) {`
`47`	`47`	`to.mergeFrom(from.get());`
`48`	`48`	`}`
`49`	`49`	`};`