---

Ajay Kannan · Ajay Kannan · commit 86cbdeb1c80b · 2016-02-16T10:48:46.000-08:00
yaml --- r: 1693 b: refs/heads/master c: 65f4f80 h: refs/heads/master i: 1691: 28724d1
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8050cca81afee5f6a952cc7c544e3ae5aa616633
+refs/heads/master: 65f4f8063273b65b258aaf2be73e0609afb9583a
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
diff --git a/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java b/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
@@ -157,6 +157,8 @@ public String kind() {
     return leaf().kind();
   }
 
+  abstract BaseKey parent();
+
   @Override
   public int hashCode() {
     return Objects.hash(projectId(), namespace(), path());
diff --git a/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/IncompleteKey.java b/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/IncompleteKey.java
@@ -84,6 +84,25 @@ static IncompleteKey fromPb(DatastoreV1.Key keyPb) {
     return new IncompleteKey(projectId, namespace, path);
   }
 
+  /**
+   * Returns the key's parent.
+   */
+  @Override
+  public Key parent() {
+    List<PathElement> ancestors = ancestors();
+    if (!ancestors.isEmpty()) {
+      PathElement parent = ancestors.get(ancestors.size() - 1);
+      Key.Builder keyBuilder;
+      if (parent.hasName()) {
+        keyBuilder = Key.builder(projectId(), parent.kind(), parent.name());
+      } else {
+        keyBuilder = Key.builder(projectId(), parent.kind(), parent.id());
+      }
+      return keyBuilder.ancestors(ancestors.subList(0, ancestors.size() - 1)).build();
+    }
+    return null;
+  }
+
   public static Builder builder(String projectId, String kind) {
     return new Builder(projectId, kind);
   }
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java
@@ -50,6 +50,11 @@ protected BaseKey build() {
         protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
           return null;
         }
+
+        @Override
+        protected BaseKey parent() {
+          return null;
+        }
       };
     }
   }
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/IncompleteKeyTest.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/IncompleteKeyTest.java
@@ -17,21 +17,30 @@
 package com.google.gcloud.datastore;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class IncompleteKeyTest {
 
+private static IncompleteKey pk1, pk2;
+  private static Key parent;
+
+  @Before
+  public void setUp() {
+    pk1 = IncompleteKey.builder("ds", "kind1").build();
+    parent = Key.builder("ds", "kind2", 10).build();
+    pk2 = IncompleteKey.builder(parent, "kind3").build();
+  }
+
   @Test
   public void testBuilders() throws Exception {
-    IncompleteKey pk1 = IncompleteKey.builder("ds", "kind1").build();
     assertEquals("ds", pk1.projectId());
     assertEquals("kind1", pk1.kind());
     assertTrue(pk1.ancestors().isEmpty());
 
-    Key parent = Key.builder("ds", "kind2", 10).build();
-    IncompleteKey pk2 = IncompleteKey.builder(parent, "kind3").build();
     assertEquals("ds", pk2.projectId());
     assertEquals("kind3", pk2.kind());
     assertEquals(parent.path(), pk2.ancestors());
@@ -42,4 +51,10 @@ public void testBuilders() throws Exception {
     assertEquals("kind4", pk3.kind());
     assertEquals(parent.path(), pk3.ancestors());
   }
+
+  @Test
+  public void testParent() {
+    assertNull(pk1.parent());
+    assertEquals(parent, pk2.parent());
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,8 @@ public String kind() {`
`157`	`157`	`return leaf().kind();`
`158`	`158`	`}`
`159`	`159`
	`160`	`+ abstract BaseKey parent();`
	`161`	`+`
`160`	`162`	`@Override`
`161`	`163`	`public int hashCode() {`
`162`	`164`	`return Objects.hash(projectId(), namespace(), path());`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ protected BaseKey build() {`
`50`	`50`	`protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {`
`51`	`51`	`return null;`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ @Override`
	`55`	`+ protected BaseKey parent() {`
	`56`	`+ return null;`
	`57`	`+ }`
`53`	`58`	`};`
`54`	`59`	`}`
`55`	`60`	`}`