Merge pull request #145 from GoogleCloudPlatform/update-datastore-sni…

…ppets Changes for v1beta3
GoogleCloudPlatform · Apr 2, 2016 · c4439f6 · c4439f6
2 parents f5c436e + 80318c8
commit c4439f6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/datastore/pom.xml b/datastore/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>com.google.gcloud</groupId>
       <artifactId>gcloud-java-datastore</artifactId>
-      <version>0.1.5</version>
+      <version>0.1.7</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java
@@ -43,11 +43,11 @@
 import com.google.gcloud.datastore.Query;
 import com.google.gcloud.datastore.Query.ResultType;
 import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.ReadOption;
 import com.google.gcloud.datastore.StringValue;
 import com.google.gcloud.datastore.StructuredQuery;
 import com.google.gcloud.datastore.StructuredQuery.CompositeFilter;
 import com.google.gcloud.datastore.StructuredQuery.OrderBy;
-import com.google.gcloud.datastore.StructuredQuery.Projection;
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.datastore.Transaction;
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
@@ -373,7 +373,8 @@ private void setUpQueryTests() {
         .set("priority", 4)
         .set("created", includedDate)
         .set("percent_complete", 10.0)
-        .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build())
+        .set("description",
+            StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build())
         .set("tag", "fun", "l", "programming")
         .build());
   }
@@ -512,7 +513,7 @@ public void testProjectionQuery() {
     // [START projection_query]
     Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
         .kind("Task")
-        .projection(Projection.property("priority"), Projection.property("percent_complete"))
+        .projection("priority", "percent_complete")
         .build();
     // [END projection_query]
     assertValidQuery(query);
@@ -523,7 +524,7 @@ public void testRunProjectionQuery() {
     setUpQueryTests();
     Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
         .kind("Task")
-        .projection(Projection.property("priority"), Projection.property("percent_complete"))
+        .projection("priority", "percent_complete")
         .build();
     // [START run_query_projection]
     List<Long> priorities = new LinkedList<>();
@@ -565,8 +566,8 @@ public void testDistinctQuery() {
     // [START distinct_query]
     Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
         .kind("Task")
-        .projection(Projection.property("type"), Projection.property("priority"))
-        .groupBy("type", "priority")
+        .projection("type", "priority")
+        .distinctOn("type", "priority")
         .orderBy(OrderBy.asc("type"), OrderBy.asc("priority"))
         .build();
     // [END distinct_query]
@@ -579,8 +580,8 @@ public void testDistinctOnQuery() {
     // [START distinct_on_query]
     Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
         .kind("Task")
-        .projection(Projection.property("type"), Projection.first("priority"))
-        .groupBy("type")
+        .projection("type", "priority")
+        .distinctOn("type")
         .orderBy(OrderBy.asc("type"), OrderBy.asc("priority"))
         .build();
     // [END distinct_on_query]
@@ -726,9 +727,16 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
 
   @Test
   public void testEventualConsistentQuery() {
+    setUpQueryTests();
     // [START eventual_consistent_query]
-    // Read consistency cannot be specified in gcloud-java.
+    Query<Entity> query = Query.entityQueryBuilder()
+        .kind("Task")
+        .filter(PropertyFilter.hasAncestor(
+            datastore.newKeyFactory().kind("TaskList").newKey("default")))
+        .build();
+    datastore.run(query, ReadOption.eventualConsistency());
     // [END eventual_consistent_query]
+    assertValidQuery(query);
   }
 
   @Test

diff --git a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -56,7 +56,7 @@ public class TaskList {
   Key addTask(String description) {
     Key key = datastore.allocateId(keyFactory.newKey());
     Entity task = Entity.builder(key)
-        .set("description", StringValue.builder(description).indexed(false).build())
+        .set("description", StringValue.builder(description).excludeFromIndexes(true).build())
         .set("created", DateTime.now())
         .set("done", false)
         .build();