---

Ajay Kannan · Ajay Kannan · commit aadb56f96632 · 2016-02-16T17:05:49.000-08:00
yaml --- r: 6939 b: refs/heads/tswast-patch-1 c: 662f57f h: refs/heads/master i: 6937: 89a6980 6935: 2753eb8
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 274b9ae5dfe0b8fc749dc5e55c38f574f09f8f0b
+refs/heads/tswast-patch-1: 662f57f18845f8d6e5aadd52dddf2b118422c6e5
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -370,7 +370,7 @@ public B set(String name, List<? extends Value<?>> values) {
      * @param others other values in the list
      */
     public B set(String name, Value<?> first, Value<?> second, Value<?>... others) {
-      properties.put(name, of(first, second, others));
+      properties.put(name, ListValue.builder().addValue(first).addValue(second, others).build());
       return self();
     }
 
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ListValue.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ListValue.java
@@ -70,17 +70,16 @@ private Builder() {
       super(ValueType.LIST);
     }
 
-    public Builder addValue(Value<?> value) {
+    private void addValueHelper(Value<?> value) {
       // see datastore_v1.proto definition for list_value
       Preconditions.checkArgument(value.type() != ValueType.LIST, "Cannot contain another list");
       listBuilder.add(value);
-      return this;
     }
 
     public Builder addValue(Value<?> first, Value<?>... other) {
-      addValue(first);
+      addValueHelper(first);
       for (Value<?> value : other) {
-        addValue(value);
+        addValueHelper(value);
       }
       return this;
     }
@@ -125,10 +124,6 @@ public ListValue(Value<?> first, Value<?>... other) {
     this(new Builder().addValue(first, other));
   }
 
-  ListValue(Value<?> first, Value<?> second, Value<?>... other) {
-    this(new Builder().addValue(first).addValue(second, other));
-  }
-
   private ListValue(Builder builder) {
     super(builder);
   }
@@ -146,10 +141,6 @@ public static ListValue of(Value<?> first, Value<?>... other) {
     return new ListValue(first, other);
   }
 
-  static ListValue of(Value<?> first, Value<?> second, Value<?>... other) {
-    return new ListValue(first, second, other);
-  }
-
   public static Builder builder() {
     return new Builder();
   }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ public B set(String name, List<? extends Value<?>> values) {`
`370`	`370`	`* @param others other values in the list`
`371`	`371`	`*/`
`372`	`372`	`public B set(String name, Value<?> first, Value<?> second, Value<?>... others) {`
`373`		`- properties.put(name, of(first, second, others));`
	`373`	`+ properties.put(name, ListValue.builder().addValue(first).addValue(second, others).build());`
`374`	`374`	`return self();`
`375`	`375`	`}`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -70,17 +70,16 @@ private Builder() {`
`70`	`70`	`super(ValueType.LIST);`
`71`	`71`	`}`
`72`	`72`
`73`		`- public Builder addValue(Value<?> value) {`
	`73`	`+ private void addValueHelper(Value<?> value) {`
`74`	`74`	`// see datastore_v1.proto definition for list_value`
`75`	`75`	`Preconditions.checkArgument(value.type() != ValueType.LIST, "Cannot contain another list");`
`76`	`76`	`listBuilder.add(value);`
`77`		`- return this;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`public Builder addValue(Value<?> first, Value<?>... other) {`
`81`		`- addValue(first);`
	`80`	`+ addValueHelper(first);`
`82`	`81`	`for (Value<?> value : other) {`
`83`		`- addValue(value);`
	`82`	`+ addValueHelper(value);`
`84`	`83`	`}`
`85`	`84`	`return this;`
`86`	`85`	`}`
`@@ -125,10 +124,6 @@ public ListValue(Value<?> first, Value<?>... other) {`
`125`	`124`	`this(new Builder().addValue(first, other));`
`126`	`125`	`}`
`127`	`126`
`128`		`- ListValue(Value<?> first, Value<?> second, Value<?>... other) {`
`129`		`- this(new Builder().addValue(first).addValue(second, other));`
`130`		`- }`
`131`		`-`
`132`	`127`	`private ListValue(Builder builder) {`
`133`	`128`	`super(builder);`
`134`	`129`	`}`
`@@ -146,10 +141,6 @@ public static ListValue of(Value<?> first, Value<?>... other) {`
`146`	`141`	`return new ListValue(first, other);`
`147`	`142`	`}`
`148`	`143`
`149`		`- static ListValue of(Value<?> first, Value<?> second, Value<?>... other) {`
`150`		`- return new ListValue(first, second, other);`
`151`		`- }`
`152`		`-`
`153`	`144`	`public static Builder builder() {`
`154`	`145`	`return new Builder();`
`155`	`146`	`}`