Datastore: expose Entity::fromPb, FullEntity::fromPb and Value::fromPb (#5759)

topecongiro · chingor13 · commit a5e6abf60e20 · 2019-07-30T08:58:43.000-07:00
diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
@@ -86,7 +86,7 @@ public static Builder newBuilder(Key key, FullEntity<?> copyFrom) {
     return new Builder(key, copyFrom);
   }
 
-  static Entity fromPb(com.google.datastore.v1.Entity entityPb) {
+  public static Entity fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder().fill(entityPb).build();
   }
 }
diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
@@ -62,7 +62,7 @@ public static <K extends IncompleteKey> Builder<K> newBuilder(FullEntity<K> copy
     return new Builder<>(copyFrom);
   }
 
-  static FullEntity<?> fromPb(com.google.datastore.v1.Entity entityPb) {
+  public static FullEntity<?> fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder<>().fill(entityPb).build();
   }
 }
diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
@@ -211,7 +211,7 @@ com.google.datastore.v1.Value toPb() {
     return getType().getMarshaller().toProto(this);
   }
 
-  static Value<?> fromPb(com.google.datastore.v1.Value proto) {
+  public static Value<?> fromPb(com.google.datastore.v1.Value proto) {
     ValueTypeCase descriptorId = proto.getValueTypeCase();
     ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber());
     return valueType == null

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static Builder newBuilder(Key key, FullEntity<?> copyFrom) {`
`86`	`86`	`return new Builder(key, copyFrom);`
`87`	`87`	`}`
`88`	`88`
`89`		`- static Entity fromPb(com.google.datastore.v1.Entity entityPb) {`
	`89`	`+ public static Entity fromPb(com.google.datastore.v1.Entity entityPb) {`
`90`	`90`	`return new Builder().fill(entityPb).build();`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static <K extends IncompleteKey> Builder<K> newBuilder(FullEntity<K> copy`
`62`	`62`	`return new Builder<>(copyFrom);`
`63`	`63`	`}`
`64`	`64`
`65`		`- static FullEntity<?> fromPb(com.google.datastore.v1.Entity entityPb) {`
	`65`	`+ public static FullEntity<?> fromPb(com.google.datastore.v1.Entity entityPb) {`
`66`	`66`	`return new Builder<>().fill(entityPb).build();`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ com.google.datastore.v1.Value toPb() {`
`211`	`211`	`return getType().getMarshaller().toProto(this);`
`212`	`212`	`}`
`213`	`213`
`214`		`- static Value<?> fromPb(com.google.datastore.v1.Value proto) {`
	`214`	`+ public static Value<?> fromPb(com.google.datastore.v1.Value proto) {`
`215`	`215`	`ValueTypeCase descriptorId = proto.getValueTypeCase();`
`216`	`216`	`ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber());`
`217`	`217`	`return valueType == null`