Simplify to/from url safe and fix access issue in workaround

Ajay Kannan · Ajay Kannan · commit 03ca1bfbf214 · 2016-01-25T12:44:49.000-08:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
@@ -17,20 +17,14 @@
 package com.google.gcloud.datastore;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.datastore.DatastoreV1;
 import com.google.api.services.datastore.DatastoreV1.Value;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.io.BaseEncoding;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.TextFormat;
-import com.google.protobuf.TextFormat.ParseException;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 
 /**
  * A Google Cloud Datastore cursor.
@@ -74,23 +68,16 @@ ByteString byteString() {
    * Returns the cursor in an encoded form that can be used as part of a URL.
    */
   public String toUrlSafe() {
-    try {
-      return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name());
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Unexpected encoding exception", e);
-    }
+    return BaseEncoding.base64Url().encode(byteString.toByteArray());
   }
 
   /**
    * Create a {@code Cursor} given its URL safe encoded form.
    */
   public static Cursor fromUrlSafe(String urlSafe) {
     try {
-      String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name());
-      DatastoreV1.Value.Builder builder = DatastoreV1.Value.newBuilder();
-      TextFormat.merge(utf8Str, builder);
-      return fromPb(builder.build());
-    } catch (UnsupportedEncodingException | ParseException e) {
+      return Cursor.copyFrom(BaseEncoding.base64Url().decode(urlSafe));
+    } catch (IllegalArgumentException e) {
       throw new IllegalStateException("Unexpected decoding exception", e);
     }
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -782,7 +782,7 @@ public StructuredQuery<V> build() {
     }
   }
 
-  static final class Builder<V> extends BaseBuilder<V, Builder<V>> {
+  public static final class Builder<V> extends BaseBuilder<V, Builder<V>> {
 
     Builder(ResultType<V> resultType) {
       super(resultType);

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ public StructuredQuery<V> build() {`
`782`	`782`	`}`
`783`	`783`	`}`
`784`	`784`
`785`		`- static final class Builder<V> extends BaseBuilder<V, Builder<V>> {`
	`785`	`+ public static final class Builder<V> extends BaseBuilder<V, Builder<V>> {`
`786`	`786`
`787`	`787`	`Builder(ResultType<V> resultType) {`
`788`	`788`	`super(resultType);`