---

aozarov · aozarov · commit 77b7d25ae1fd · 2015-03-16T13:30:56.000-07:00
yaml --- r: 5901 b: refs/heads/tswast-patch-1 c: ebdf778 h: refs/heads/master i: 5899: 9a0986a
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: cad5720364b29b10cf06c29ce892a56a1d308641
+refs/heads/tswast-patch-1: ebdf778bc2512cace9b9244d754034384d877309
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/pom.xml b/branches/tswast-patch-1/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.1</version>
+  <version>0.0.2</version>
   <name>GCloud Java</name>
   <url>https://github.com/GoogleCloudPlatform/gcloud-java</url>
   <description>
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Query.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Query.java
@@ -224,7 +224,7 @@ public static KeyQueryBuilder keyQueryBuilder() {
   /**
    * Returns a new {@link StructuredQuery} builder for projection queries.
    */
-  public static ProjectionEntityQueryBuilder projectionQueryBuilder() {
+  public static ProjectionEntityQueryBuilder projectionEntityQueryBuilder() {
     return new ProjectionEntityQueryBuilder();
   }
 }
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -65,7 +65,7 @@
  * <p>A less trivial example of a projection query that returns the first 10 results
  * of "age" and "name" properties (sorted and grouped by "age") with an age greater than 18
  * <pre>{@code
- *   Query&lt;ProjectionEntity&gt; query = Query.projectionQueryBuilder()
+ *   Query&lt;ProjectionEntity&gt; query = Query.projectionEntityQueryBuilder()
  *       .kind(kind)
  *       .projection(Projection.property("age"), Projection.first("name"))
  *       .filter(PropertyFilter.gt("age", 18))
diff --git a/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java b/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java
@@ -412,7 +412,7 @@ public void testRunStructuredQuery() {
     assertFalse(results2.hasNext());
 
     StructuredQuery<ProjectionEntity> keyOnlyProjectionQuery =
-        Query.projectionQueryBuilder()
+        Query.projectionEntityQueryBuilder()
         .kind(KIND1).projection(Projection.property("__key__")).build();
     QueryResults<ProjectionEntity> results3 = datastore.run(keyOnlyProjectionQuery);
     assertTrue(results3.hasNext());
@@ -421,7 +421,7 @@ public void testRunStructuredQuery() {
     assertTrue(projectionEntity.names().isEmpty());
     assertFalse(results2.hasNext());
 
-    StructuredQuery<ProjectionEntity> projectionQuery = Query.projectionQueryBuilder()
+    StructuredQuery<ProjectionEntity> projectionQuery = Query.projectionEntityQueryBuilder()
         .kind(KIND2)
         .projection(Projection.property("age"), Projection.first("name"))
         .filter(PropertyFilter.gt("age", 18))
diff --git a/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -67,7 +67,7 @@ public class SerializationTest {
       .kind("k")
       .filter(PropertyFilter.eq("p1", "hello"))
       .build();
-  private static final Query<ProjectionEntity> QUERY3 = Query.projectionQueryBuilder()
+  private static final Query<ProjectionEntity> QUERY3 = Query.projectionEntityQueryBuilder()
       .kind("k")
       .namespace("ns1")
       .projection(Projection.property("p"))

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public static KeyQueryBuilder keyQueryBuilder() {`
`224`	`224`	`/**`
`225`	`225`	`* Returns a new {@link StructuredQuery} builder for projection queries.`
`226`	`226`	`*/`
`227`		`- public static ProjectionEntityQueryBuilder projectionQueryBuilder() {`
	`227`	`+ public static ProjectionEntityQueryBuilder projectionEntityQueryBuilder() {`
`228`	`228`	`return new ProjectionEntityQueryBuilder();`
`229`	`229`	`}`
`230`	`230`	`}`