From f287462fd9edda07a34658be91f04421357f6519 Mon Sep 17 00:00:00 2001
From: Ajay Kannan <ajaykannan@google.com>
Date: Tue, 26 Jan 2016 17:08:05 -0800
Subject: [PATCH] Minor refactoring and javadoc fixes

---
 .../google/gcloud/datastore/EntityQuery.java  |  2 +-
 .../com/google/gcloud/datastore/KeyQuery.java |  2 +-
 .../datastore/ProjectionEntityQuery.java      |  9 +++++++-
 .../gcloud/datastore/StructuredQueryTest.java | 21 +++++--------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
index cc2b978603ed..902168f20f48 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
@@ -30,7 +30,7 @@ public final class EntityQuery extends StructuredQuery<Entity> {
   private static final long serialVersionUID = 2990565454831019471L;
 
   /**
-   * A {@code EntityQuery} builder for queries that return Entity results.
+   * A {@code EntityQuery} builder for queries that return {@link Entity} results.
    */
   public static final class Builder extends StructuredQuery.BuilderImpl<Entity, Builder> {
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
index 73ee9a4481aa..7afa0f5099d6 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
@@ -30,7 +30,7 @@ public final class KeyQuery extends StructuredQuery<Key> {
   private static final long serialVersionUID = -746768461459070045L;
 
   /**
-   * A {@code KeyQuery} builder for queries that return Key results.
+   * A {@code KeyQuery} builder for queries that return {@link Key} results.
    */
   public static final class Builder extends StructuredQuery.BuilderImpl<Key, Builder> {
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
index c0f8617f9183..bad9fc5af2d0 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
@@ -28,7 +28,8 @@ public final class ProjectionEntityQuery extends StructuredQuery<ProjectionEntit
   private static final long serialVersionUID = 5488451194542425391L;
 
   /**
-   * A {@code ProjectionEntityQuery} builder for queries that return Key results.
+   * A {@code ProjectionEntityQuery} builder for queries that return {@link ProjectionEntity}
+   * results.
    */
   public static final class Builder extends StructuredQuery.BuilderImpl<ProjectionEntity, Builder> {
 
@@ -43,6 +44,7 @@ public static final class Builder extends StructuredQuery.BuilderImpl<Projection
     /**
      * Clears the projection clause.
      */
+    @Override
     public Builder clearProjection() {
       super.clearProjection();
       return this;
@@ -51,6 +53,7 @@ public Builder clearProjection() {
     /**
      * Sets the query's projection clause (clearing any previously specified Projection settings).
      */
+    @Override
     public Builder projection(Projection projection, Projection... others) {
       super.projection(projection, others);
       return this;
@@ -59,6 +62,7 @@ public Builder projection(Projection projection, Projection... others) {
     /**
      * Adds one or more projections to the existing projection clause.
      */
+    @Override
     public Builder addProjection(Projection projection, Projection... others) {
       super.addProjection(projection, others);
       return this;
@@ -67,6 +71,7 @@ public Builder addProjection(Projection projection, Projection... others) {
     /**
      * Clears the group by clause.
      */
+    @Override
     public Builder clearGroupBy() {
       super.clearGroupBy();
       return this;
@@ -75,6 +80,7 @@ public Builder clearGroupBy() {
     /**
      * Sets the query's group by clause (clearing any previously specified GroupBy settings).
      */
+    @Override
     public Builder groupBy(String property, String... others) {
       super.groupBy(property, others);
       return this;
@@ -83,6 +89,7 @@ public Builder groupBy(String property, String... others) {
     /**
      * Adds one or more properties to the existing group by clause.
      */
+    @Override
     public Builder addGroupBy(String property, String... others) {
       super.addGroupBy(property, others);
       return this;
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java
index 4c6150f630dd..b0d188cae16e 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java
@@ -155,22 +155,11 @@ public void testToAndFromPb() {
 
   @Test
   public void testToBuilder() {
-    StructuredQuery<Entity> entityQuery =
-    Query.entityQueryBuilder().namespace("n1").kind("k1").build();
-    Query<Entity> entityQueryResult = entityQuery.toBuilder().build();
-    StructuredQuery<Key> keyQuery = Query.keyQueryBuilder().namespace("n2").kind("k2").build();
-    Query<Key> keyQueryResult = keyQuery.toBuilder().build();
-    StructuredQuery<ProjectionEntity> projectionEntityQuery = Query.projectionEntityQueryBuilder()
-        .kind("k3")
-        .projection(Projection.property("p1"), Projection.property("p2"))
-        .build();
-    Query<ProjectionEntity> projectionEntityQueryResult = projectionEntityQuery.toBuilder().build();
-    assertEquals(entityQuery, entityQueryResult);
-    assertTrue(entityQueryResult instanceof EntityQuery);
-    assertEquals(keyQuery, keyQueryResult);
-    assertTrue(keyQueryResult instanceof KeyQuery);
-    assertEquals(projectionEntityQuery, projectionEntityQueryResult);
-    assertTrue(projectionEntityQueryResult instanceof ProjectionEntityQuery);
+    List<StructuredQuery<?>> queries =
+        ImmutableList.<StructuredQuery<?>>of(ENTITY_QUERY, KEY_QUERY, PROJECTION_QUERY);
+    for (StructuredQuery<?> query : queries) {
+      assertEquals(query, query.toBuilder().build());
+    }
   }
 
   @Test