Skip to content

Include a trailing /documents on root resource paths #191

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

Merged
merged 1 commit into from
Jan 12, 2019
Merged

Include a trailing /documents on root resource paths #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,15 @@ public DocumentKey decodeKey(String name) {
}

private String encodeQueryPath(ResourcePath path) {
if (path.length() == 0) {
// If the path is empty, the backend requires we leave off the /documents at the end.
return databaseName;
}
return encodeResourceName(databaseId, path);
}

private ResourcePath decodeQueryPath(String name) {
ResourcePath resource = decodeResourceName(name);
if (resource.length() == 4) {
// Path missing the trailing documents path segment, indicating an empty path.
// In v1beta1 queries for collections at the root did not have a trailing "/documents". In v1
// all resource paths contain "/documents". Preserve the ability to read the v1beta1 form for
// compatibility with queries persisted in the local query cache.
return ResourcePath.EMPTY;
} else {
return extractLocalPathFromResourceName(resource);
Expand Down
14 changes: 7 additions & 7 deletions ...se-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ public void testEncodesFirstLevelAncestorQueries() {
.addOrderBy(defaultKeyOrder());
QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -558,7 +558,7 @@ public void testEncodesSingleFilterAtFirstLevelCollections() {
.addOrderBy(defaultKeyOrder());
QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -664,7 +664,7 @@ private void unaryFilterTest(Object equalityValue, UnaryFilter.Operator unaryOpe
.addOrderBy(defaultKeyOrder());
QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -692,7 +692,7 @@ public void testEncodesSortOrders() {
.addOrderBy(defaultKeyOrder());
QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -751,7 +751,7 @@ public void testEncodesLimits() {
.setLimit(Int32Value.newBuilder().setValue(26));
QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -791,7 +791,7 @@ public void testEncodesBounds() {

QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down Expand Up @@ -819,7 +819,7 @@ public void testEncodesResumeTokens() {

QueryTarget.Builder queryBuilder =
QueryTarget.newBuilder()
.setParent("projects/p/databases/d")
.setParent("projects/p/databases/d/documents")
.setStructuredQuery(structuredQueryBuilder);
Target expected =
Target.newBuilder()
Expand Down