---

aozarov · aozarov · commit 7dd7d1fafab5 · 2014-12-12T09:21:51.000-08:00
yaml --- r: 55 b: refs/heads/master c: 41422a9 h: refs/heads/master i: 53: 70a1976 51: 0d1ed74 47: b85f58e v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81d22393f43ece2d3cf14f83ad14403ae6a6983a
+refs/heads/master: 41422a9d39c4e8c49e1cfa98d32ee2e36ba38c95
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/trunk/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -1,5 +1,16 @@
 package com.google.gcloud.datastore;
 
+import static com.google.gcloud.datastore.BlobValue.of;
+import static com.google.gcloud.datastore.BooleanValue.of;
+import static com.google.gcloud.datastore.DateTimeValue.of;
+import static com.google.gcloud.datastore.DoubleValue.of;
+import static com.google.gcloud.datastore.EntityValue.of;
+import static com.google.gcloud.datastore.KeyValue.of;
+import static com.google.gcloud.datastore.ListValue.of;
+import static com.google.gcloud.datastore.LongValue.of;
+import static com.google.gcloud.datastore.NullValue.of;
+import static com.google.gcloud.datastore.StringValue.of;
+
 import com.google.api.services.datastore.DatastoreV1;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.gcloud.datastore.Value.Type;
@@ -58,57 +69,57 @@ public B set(String name, Value<?> value) {
     }
 
     public B setNull(String name) {
-      properties.put(name, new NullValue());
+      properties.put(name, of());
       return self();
     }
 
     public B set(String name, String value) {
-      properties.put(name, new StringValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, long value) {
-      properties.put(name, new LongValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, double value) {
-      properties.put(name, new DoubleValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, boolean value) {
-      properties.put(name, new BooleanValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, DateTime value) {
-      properties.put(name, new DateTimeValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, Key value) {
-      properties.put(name, new KeyValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, PartialEntity value) {
-      properties.put(name, new EntityValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
     public B set(String name, List<? extends Value<?>> values) {
-      properties.put(name, new ListValue(values));
+      properties.put(name, of(values));
       return self();
     }
 
     public B set(String name, Value<?>... value) {
-      properties.put(name, new ListValue(Arrays.asList(value)));
+      properties.put(name, of(Arrays.asList(value)));
       return self();
     }
 
     public B set(String name, Blob value) {
-      properties.put(name, new BlobValue(value));
+      properties.put(name, of(value));
       return self();
     }
 
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/BlobValue.java b/trunk/src/main/java/com/google/gcloud/datastore/BlobValue.java
@@ -57,6 +57,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static BlobValue of(Blob blob) {
+    return new BlobValue(blob);
+  }
+
   public static Builder builder(Blob blob) {
     return new Builder().set(blob);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/BooleanValue.java b/trunk/src/main/java/com/google/gcloud/datastore/BooleanValue.java
@@ -57,6 +57,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static BooleanValue of(boolean value) {
+    return new BooleanValue(value);
+  }
+
   public static Builder builder(boolean value) {
     return new Builder().set(value);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/DateTimeValue.java b/trunk/src/main/java/com/google/gcloud/datastore/DateTimeValue.java
@@ -58,6 +58,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static DateTimeValue of(DateTime dateTime) {
+    return new DateTimeValue(dateTime);
+  }
+
   public static Builder builder(DateTime dateTime) {
     return new Builder().set(dateTime);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/DoubleValue.java b/trunk/src/main/java/com/google/gcloud/datastore/DoubleValue.java
@@ -57,6 +57,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static DoubleValue of(double value) {
+    return new DoubleValue(value);
+  }
+
   public static Builder builder(double value) {
     return new Builder().set(value);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/EntityValue.java b/trunk/src/main/java/com/google/gcloud/datastore/EntityValue.java
@@ -66,6 +66,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static EntityValue of(PartialEntity entity) {
+    return new EntityValue(entity);
+  }
+
   public static Builder builder(PartialEntity entity) {
     return new Builder().set(entity).indexed(false);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/KeyValue.java b/trunk/src/main/java/com/google/gcloud/datastore/KeyValue.java
@@ -57,6 +57,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static KeyValue of(Key key) {
+    return new KeyValue(key);
+  }
+
   public static Builder builder(Key key) {
     return new Builder().set(key);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/ListValue.java b/trunk/src/main/java/com/google/gcloud/datastore/ListValue.java
@@ -116,6 +116,14 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static ListValue of(List<? extends Value<?>> values) {
+    return new ListValue(values);
+  }
+
+  public static ListValue of(Value<?> first, Value<?>... other) {
+    return new ListValue(first, other);
+  }
+
   public static Builder builder() {
     return new Builder();
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/LongValue.java b/trunk/src/main/java/com/google/gcloud/datastore/LongValue.java
@@ -57,6 +57,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static LongValue of(long value) {
+    return new LongValue(value);
+  }
+
   public static Builder builder(long value) {
     return new Builder().set(value);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/NullValue.java b/trunk/src/main/java/com/google/gcloud/datastore/NullValue.java
@@ -63,6 +63,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static NullValue of() {
+    return new NullValue();
+  }
+
   public static Builder builder() {
     return new Builder();
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/RawValue.java b/trunk/src/main/java/com/google/gcloud/datastore/RawValue.java
@@ -55,6 +55,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  static RawValue of(DatastoreV1.Value valuePb) {
+    return new RawValue(valuePb);
+  }
+
   static Builder builder(DatastoreV1.Value valuePb) {
     Builder builder = new Builder();
     if (valuePb.hasIndexed()) {
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/StringValue.java b/trunk/src/main/java/com/google/gcloud/datastore/StringValue.java
@@ -61,6 +61,10 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
+  public static StringValue of(String value) {
+    return new StringValue(value);
+  }
+
   public static Builder builder(String value) {
     return new Builder().set(value);
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/trunk/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -1,6 +1,13 @@
 package com.google.gcloud.datastore;
 
 import static com.google.api.client.util.Preconditions.checkNotNull;
+import static com.google.gcloud.datastore.BlobValue.of;
+import static com.google.gcloud.datastore.BooleanValue.of;
+import static com.google.gcloud.datastore.DateTimeValue.of;
+import static com.google.gcloud.datastore.DoubleValue.of;
+import static com.google.gcloud.datastore.KeyValue.of;
+import static com.google.gcloud.datastore.LongValue.of;
+import static com.google.gcloud.datastore.StringValue.of;
 
 import com.google.api.client.util.Preconditions;
 import com.google.api.services.datastore.DatastoreV1;
@@ -51,6 +58,7 @@ public enum Operator {
       GREATER_THAN_OR_EQUAL,
       EQUAL,
       HAS_ANCESTOR,
+      IS_NULL,
       AND
     }
 
@@ -85,6 +93,34 @@ public static Filter le(String property, Value<?> value) {
       return new Filter(property, Operator.LESS_THAN, value, null);
     }
 
+    public static Filter le(String property, String value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, long value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, double value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, boolean value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, DateTime value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, Key value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
+    public static Filter le(String property, Blob value) {
+      return new Filter(property, Operator.LESS_THAN, of(value), null);
+    }
+
     public static Filter lte(String property, Value<?> value) {
       return new Filter(property, Operator.LESS_THAN_OR_EQUAL, value, null);
     }
@@ -105,6 +141,10 @@ public static Filter hasAncestor(String property) {
       return new Filter(property, Operator.HAS_ANCESTOR, null, null);
     }
 
+    public static Filter isNull(String property) {
+      return new Filter(property, Operator.IS_NULL, null, null);
+    }
+
     public static Filter and(Filter first, Filter... other) {
       Set<Filter> combined = new LinkedHashSet<>();
       for (Filter f : Iterables.concat(Collections.singleton(first), Arrays.asList(other))) {
diff --git a/trunk/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java b/trunk/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java
@@ -21,8 +21,8 @@ public class DatastoreServiceTest {
   private static final String DATASET = "dataset1";
   private static final String KIND1 = "kind1";
   private static final String KIND2 = "kind2";
-  private static final NullValue NULL_VALUE = new NullValue();
-  private static final StringValue STR_VALUE = new StringValue("str");
+  private static final NullValue NULL_VALUE = NullValue.of();
+  private static final StringValue STR_VALUE = StringValue.of("str");
   private static final BooleanValue BOOL_VALUE = BooleanValue.builder(false).indexed(false).build();
   private static final PartialKey PARTIAL_KEY1 = PartialKey.builder(DATASET, KIND1).build();
   private static final PartialKey PARTIAL_KEY2 = PartialKey.builder(DATASET, KIND2).build();
@@ -31,18 +31,18 @@ public class DatastoreServiceTest {
   private static final Key KEY3 = Key.builder(KEY2).name("bla").build();
   private static final Key KEY4 = KEY2.newKey("newName1");
   private static final Key KEY5 = KEY2.newKey("newName2");
-  private static final KeyValue KEY_VALUE = new KeyValue(KEY1);
+  private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
   private static final ListValue LIST_VALUE1 = ListValue.builder()
       .addValue(NULL_VALUE)
       .addValue(STR_VALUE, BOOL_VALUE)
       .build();
-  private static final ListValue LIST_VALUE2 = new ListValue(Collections.singletonList(KEY_VALUE));
+  private static final ListValue LIST_VALUE2 = ListValue.of(Collections.singletonList(KEY_VALUE));
   private static final PartialEntity PARTIAL_ENTITY1 = PartialEntity.builder(PARTIAL_KEY2)
       .set("str", STR_VALUE).set("bool", BOOL_VALUE).set("list", LIST_VALUE1).build();
   private static final PartialEntity PARTIAL_ENTITY2 = PartialEntity.builder(PARTIAL_ENTITY1)
       .remove("str").set("bool", true).set("list", LIST_VALUE1.get()).build();
   private static final Entity ENTITY1 = Entity.builder(KEY1).set("str", STR_VALUE)
-      .set("bool", BOOL_VALUE).set("partial1", new EntityValue(PARTIAL_ENTITY1))
+      .set("bool", BOOL_VALUE).set("partial1", EntityValue.of(PARTIAL_ENTITY1))
       .set("list", LIST_VALUE2).build();
   private static final Entity ENTITY2 = Entity.builder(ENTITY1).key(KEY2).remove("str")
       .setNull("null").build();
@@ -143,7 +143,7 @@ public void testNewTransactionRollback() {
     Transaction transaction = datastore.newTransaction();
     transaction.add(ENTITY3);
     Entity entity2 = Entity.builder(ENTITY2).clear().setNull("bla")
-        .set("list3", new StringValue("bla"), StringValue.builder("bla").build()).build();
+        .set("list3", StringValue.of("bla"), StringValue.builder("bla").build()).build();
     transaction.update(entity2);
     transaction.delete(KEY1);
     transaction.rollback();
@@ -200,7 +200,7 @@ public void testNewBatchWriter() {
     BatchWriter batchWriter = datastore.newBatchWriter();
     Entity entity1 = Entity.builder(ENTITY1).clear().build();
     Entity entity2 = Entity.builder(ENTITY2).clear().setNull("bla").build();
-    Entity entity4 = Entity.builder(KEY4).set("value", new StringValue("value")).build();
+    Entity entity4 = Entity.builder(KEY4).set("value", StringValue.of("value")).build();
     Entity entity5 = Entity.builder(KEY5).set("value", "value").build();
     batchWriter.add(entity4, entity5);
     batchWriter.put(ENTITY3, entity1, entity2);
diff --git a/trunk/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/trunk/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -40,20 +40,19 @@ public class SerializationTest {
       .addArgument(20)
       .namespace("ns1")
       .build();
-  private static final KeyValue KEY_VALUE = new KeyValue(KEY1);
+  private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
   private static final NullValue NULL_VALUE = NullValue.builder().indexed(true).build();
-  private static final StringValue STRING_VALUE = new StringValue("hello");
-  private static final LongValue LONG_VALUE = new LongValue(123);
-  private static final DoubleValue DOUBLE_VALUE = new DoubleValue(12.34);
-  private static final BooleanValue BOOLEAN_VALUE = new BooleanValue(true);
-  private static final DateTimeValue DATE_AND_TIME_VALUE =
-      new DateTimeValue(DateTime.now());
-  private static final BlobValue BLOB_VALUE = new BlobValue(BLOB1);
-  private static final RawValue RAW_VALUE = new RawValue(
+  private static final StringValue STRING_VALUE = StringValue.of("hello");
+  private static final LongValue LONG_VALUE = LongValue.of(123);
+  private static final DoubleValue DOUBLE_VALUE = DoubleValue.of(12.34);
+  private static final BooleanValue BOOLEAN_VALUE = BooleanValue.of(true);
+  private static final DateTimeValue DATE_AND_TIME_VALUE = DateTimeValue.of(DateTime.now());
+  private static final BlobValue BLOB_VALUE = BlobValue.of(BLOB1);
+  private static final RawValue RAW_VALUE = RawValue.of(
       DatastoreV1.Value.newBuilder().setBlobKeyValue("blob-key").setMeaning(18).build());
   private static final Entity ENTITY1 = Entity.builder(KEY1).build();
   private static final Entity ENTITY2 =
-      Entity.builder(KEY2).set("null", new NullValue()).build();
+      Entity.builder(KEY2).set("null", NullValue.of()).build();
   private static final Entity ENTITY3 = Entity.builder(KEY2)
       .set("p1", StringValue.builder("hi1").meaning(10).build())
       .set("p2", StringValue.builder("hi2").meaning(11).indexed(false).build())
@@ -66,12 +65,9 @@ public class SerializationTest {
       .set("p1", STRING_VALUE)
       .set("p2", LongValue.builder(100).indexed(false).meaning(100).build())
       .build();
-  private static final EntityValue EMBEDDED_ENTITY_VALUE1 =
-      new EntityValue(EMBEDDED_ENTITY1);
-  private static final EntityValue EMBEDDED_ENTITY_VALUE2 =
-      new EntityValue(EMBEDDED_ENTITY2);
-  private static final EntityValue EMBEDDED_ENTITY_VALUE3 =
-      new EntityValue(EMBEDDED_ENTITY3);
+  private static final EntityValue EMBEDDED_ENTITY_VALUE1 = EntityValue.of(EMBEDDED_ENTITY1);
+  private static final EntityValue EMBEDDED_ENTITY_VALUE2 = EntityValue.of(EMBEDDED_ENTITY2);
+  private static final EntityValue EMBEDDED_ENTITY_VALUE3 = EntityValue.of(EMBEDDED_ENTITY3);
   private static final ListValue LIST_VALUE = ListValue.builder()
       .addValue(NULL_VALUE)
       .addValue(STRING_VALUE)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 81d22393f43ece2d3cf14f83ad14403ae6a6983a`
	`2`	`+refs/heads/master: 41422a9d39c4e8c49e1cfa98d32ee2e36ba38c95`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ public Builder toBuilder() {`
`57`	`57`	`return new Builder().mergeFrom(this);`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public static BlobValue of(Blob blob) {`
	`61`	`+ return new BlobValue(blob);`
	`62`	`+ }`
	`63`	`+`
`60`	`64`	`public static Builder builder(Blob blob) {`
`61`	`65`	`return new Builder().set(blob);`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ public Builder toBuilder() {`
`58`	`58`	`return new Builder().mergeFrom(this);`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ public static DateTimeValue of(DateTime dateTime) {`
	`62`	`+ return new DateTimeValue(dateTime);`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`public static Builder builder(DateTime dateTime) {`
`62`	`66`	`return new Builder().set(dateTime);`
`63`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ public Builder toBuilder() {`
`66`	`66`	`return new Builder().mergeFrom(this);`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ public static EntityValue of(PartialEntity entity) {`
	`70`	`+ return new EntityValue(entity);`
	`71`	`+ }`
	`72`	`+`
`69`	`73`	`public static Builder builder(PartialEntity entity) {`
`70`	`74`	`return new Builder().set(entity).indexed(false);`
`71`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,14 @@ public Builder toBuilder() {`
`116`	`116`	`return new Builder().mergeFrom(this);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ public static ListValue of(List<? extends Value<?>> values) {`
	`120`	`+ return new ListValue(values);`
	`121`	`+ }`
	`122`	`+`
	`123`	`+ public static ListValue of(Value<?> first, Value<?>... other) {`
	`124`	`+ return new ListValue(first, other);`
	`125`	`+ }`
	`126`	`+`
`119`	`127`	`public static Builder builder() {`
`120`	`128`	`return new Builder();`
`121`	`129`	`}`