---

Ajay Kannan · Ajay Kannan · commit 6080c28be9a6 · 2016-01-25T09:36:29.000-08:00
yaml --- r: 2733 b: refs/heads/update-datastore c: f111953 h: refs/heads/master i: 2731: aa7ceeb
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 8c70155e6a938d9487e4d24fdd122c31ee22113c
+refs/heads/update-datastore: f11195303f281414fa10b74ca402c0a99bf77313
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
@@ -23,7 +23,6 @@
 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.base.Preconditions;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.TextFormat;
@@ -44,7 +43,6 @@ public final class Cursor extends Serializable<DatastoreV1.Value> {
   private final transient ByteString byteString;
 
   Cursor(ByteString byteString) {
-    Preconditions.checkArgument(byteString.isValidUtf8(), "content is not a valid UTF-8");
     this.byteString = byteString;
   }
 
diff --git a/branches/update-datastore/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/branches/update-datastore/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -39,6 +39,7 @@
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpcFactory;
+import com.google.protobuf.ByteString;
 
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
@@ -496,7 +497,7 @@ public void testQueryPaginationWithLimit() throws DatastoreException {
       }
       query = query.toBuilder().startCursor(results.cursorAfter()).build();
     }
-    assertEquals(totalCount, 5);
+    assertEquals(5, totalCount);
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
@@ -524,7 +525,8 @@ private List<RunQueryResponse> buildResponsesForQueryPaginationWithLimit() {
         .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
         .clearEntityResult()
         .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(1, 2))
-        .setEndCursor(queryResultBatchPb.getEntityResultList().get(1).getCursor())
+        .setEndCursor(
+            ByteString.copyFrom(new byte[] {(byte) 0x80})) // test invalid UTF-8 string
         .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
     QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder()
@@ -546,6 +548,17 @@ private List<RunQueryResponse> buildResponsesForQueryPaginationWithLimit() {
     return responses;
   }
 
+  @Test
+  public void testToUrlSafe() {
+    byte[][] invalidUtf8 =
+        new byte[][] {{(byte) 0xfe}, {(byte) 0xc1, (byte) 0xbf}, {(byte) 0xc0}, {(byte) 0x80}};
+    for (byte[] bytes : invalidUtf8) {
+      assertFalse(ByteString.copyFrom(bytes).isValidUtf8());
+      Cursor cursor = new Cursor(ByteString.copyFrom(bytes));
+      assertEquals(cursor, Cursor.fromUrlSafe(cursor.toUrlSafe()));
+    }
+  }
+
   @Test
   public void testAllocateId() {
     KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND1);
