Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove check for valid utf-8 cursor #578

Merged
merged 2 commits into from
Jan 25, 2016
Merged

Remove check for valid utf-8 cursor #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f111953
remove check for valid utf-8 cursor
Jan 25, 2016
03ca1bf
Simplify to/from url safe and fix access issue in workaround
Jan 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +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.base.Preconditions;
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.
Expand All @@ -44,7 +37,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;
}

Expand Down Expand Up @@ -76,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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
17 changes: 15 additions & 2 deletions gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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()
Expand All @@ -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);
Expand Down