---

aozarov · aozarov · commit 68755b56fa19 · 2014-12-08T09:02:26.000-08:00
yaml --- r: 41 b: refs/heads/master c: 5f0c319 h: refs/heads/master i: 39: 8f0624d v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6d541a3802de5ffe3aa4a56e30d3de8ed799476
+refs/heads/master: 5f0c3199bde799151c89e132ba11982bf2aaa904
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/Key.java b/trunk/src/main/java/com/google/gcloud/datastore/Key.java
@@ -14,7 +14,7 @@
 /**
  * A key that is guaranteed to be complete and could be used to reference a
  * Google Cloud Datastore {@link Entity}.
- * This class is immutable. To edit (a copy) use {@link #builder()}.
+ * This class is immutable.
  *
  * @see <a href="https://cloud.google.com/datastore/docs/concepts/entities">Google Cloud Datastore Entities, Properties, and Keys</a>
  */
@@ -47,6 +47,15 @@ public Builder(Key parent, String kind, long id) {
       this.id = id;
     }
 
+    public Builder(Key from) {
+      super(from);
+      if (from.hasId()) {
+        id = from.id();
+      } else {
+        name = from.name();
+      }
+    }
+
     @Override
     public Builder addAncestor(String kind, long id) {
       super.addAncestor(kind, id);
@@ -122,13 +131,6 @@ private Key(PartialKey key, long id) {
     super(key.dataset(), key.namespace(), newPath(key, id));
   }
 
-  @Override
-  public Builder builder() {
-    Builder builder =
-        hasId() ? new Builder(dataset(), kind(), id()) : new Builder(dataset(), kind(), name());
-    return builder.namespace(namespace()).addAncestors(ancestors());
-  }
-
   public boolean hasId() {
     return id() != null;
   }
diff --git a/trunk/src/main/java/com/google/gcloud/datastore/PartialKey.java b/trunk/src/main/java/com/google/gcloud/datastore/PartialKey.java
@@ -18,7 +18,7 @@
 /**
  * A partial key (without a name or id).
  * Could be used as metadata for {@link PartialEntity}.
- * This class is immutable. To edit (a copy) use {@link #builder()}.
+ * This class is immutable.
  */
 public class PartialKey extends Serializable<DatastoreV1.Key> {
 
@@ -142,6 +142,13 @@ public Builder(Key parent, String kind) {
       this.kind = kind;
     }
 
+    public Builder(PartialKey from) {
+      dataset = from.dataset();
+      namespace = from.namespace();
+      kind = from.kind();
+      ancestors.addAll(from.ancestors());
+    }
+
     public Builder addAncestor(String kind, long id) {
       checkArgument(id != 0, "id must not be equal to zero");
       return addAncestor(new Ancestor(kind, id));
@@ -238,10 +245,6 @@ public String kind() {
     return getLeaf().kind();
   }
 
-  public Builder builder() {
-    return new Builder(dataset(), kind()).namespace(namespace()).addAncestors(ancestors());
-  }
-
   public Key newKey(String name) {
     return new Key.Builder(dataset(), kind(), name)
         .namespace(namespace())

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: f6d541a3802de5ffe3aa4a56e30d3de8ed799476`
	`2`	`+refs/heads/master: 5f0c3199bde799151c89e132ba11982bf2aaa904`