googleapis
diff --git a/‎[refs]‎
Lines changed: 1 addition & 1 deletion b/‎[refs]‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎branches/tswast-patch-1/README.md‎
Lines changed: 2 additions & 1 deletion b/‎branches/tswast-patch-1/README.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/BaseKey.java‎
Lines changed: 0 additions & 1 deletion b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/BaseKey.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Key.java‎
Lines changed: 5 additions & 6 deletions b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Key.java‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java‎
Lines changed: 0 additions & 125 deletions b/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java‎
Lines changed: 0 additions & 125 deletions
diff --git a/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/EntityTest.java‎
Lines changed: 0 additions & 56 deletions b/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/EntityTest.java‎
Lines changed: 0 additions & 56 deletions
diff --git a/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/KeyTest.java‎
Lines changed: 0 additions & 79 deletions b/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/KeyTest.java‎
Lines changed: 0 additions & 79 deletions
diff --git a/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/PartialEntityTest.java‎
Lines changed: 0 additions & 62 deletions b/‎branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/PartialEntityTest.java‎
Lines changed: 0 additions & 62 deletions
@@ -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: 09779e91e6b9fdc16d2c7aab289a0da3c47bf9e6
+refs/heads/tswast-patch-1: ac75af9d9e7bb1e3523252d3678ae9d18df70198
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
@@ -12,7 +12,8 @@ Java idiomatic client for Google Cloud Platform services. Supported APIs include
 > Note: This package is a work-in-progress, and may occasionally
 > make backwards-incompatible changes.
 
-Documentation and examples are available [here](https://googlecloudeplatform.github.com/gcloud-java/apidocs).
+
+Documentation and examples are available [here](http://googlecloudplatform.github.io/gcloud-java/apidocs).
 
 ## Google Cloud Datastore
 
 
@@ -107,7 +107,6 @@ public B namespace(String namespace) {
   }
 
   BaseKey(String dataset, String namespace, ImmutableList<PathElement> path) {
-    Preconditions.checkArgument(!path.isEmpty(), "Path must not be empty");
     this.dataset = dataset;
     this.namespace = namespace;
     this.path = path;
 
@@ -21,8 +21,8 @@
 import com.google.api.services.datastore.DatastoreV1;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.TextFormat;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -138,7 +138,7 @@ public Object nameOrId() {
    */
   public String toUrlSafe() {
     try {
-      return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name());
+      return URLEncoder.encode(toString(), UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new IllegalStateException("Unexpected encoding exception", e);
     }
@@ -152,12 +152,11 @@ public String toUrlSafe() {
   public static Key fromUrlSafe(String urlSafe) {
     try {
       String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name());
-      DatastoreV1.Key.Builder builder = DatastoreV1.Key.newBuilder();
-      TextFormat.merge(utf8Str, builder);
-      return fromPb(builder.build());
+      DatastoreV1.Key keyPb = DatastoreV1.Key.parseFrom(ByteString.copyFromUtf8(utf8Str));
+      return fromPb(keyPb);
     } catch (UnsupportedEncodingException e) {
       throw new IllegalStateException("Unexpected decoding exception", e);
-    } catch (TextFormat.ParseException e) {
+    } catch (InvalidProtocolBufferException e) {
       throw new IllegalArgumentException("Could not parse key", e);
     }
   }
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public B namespace(String namespace) {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`BaseKey(String dataset, String namespace, ImmutableList<PathElement> path) {`
`110`		`- Preconditions.checkArgument(!path.isEmpty(), "Path must not be empty");`
`111`	`110`	`this.dataset = dataset;`
`112`	`111`	`this.namespace = namespace;`
`113`	`112`	`this.path = path;`