fix: add support for deleting nested fields that contain periods #295
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
googlebot added the cla: yes 
Codecov Report
@@ Coverage Diff @@ ## master #295 +/- ## ============================================ + Coverage 72.98% 73.00% +0.02% - Complexity 1044 1057 +13 ============================================ Files 64 64 Lines 5526 5531 +5 Branches 645 644 -1 ============================================ + Hits 4033 4038 +5 Misses 1282 1282 Partials 211 211
Continue to review full report at Codecov.
|
suraj-qlogic added the kokoro:force-run 
yoshi-kokoro removed the kokoro:force-run Contributor Author
| @schmidt-sebastian ,all the changes have been addressed PTAL |
Contributor
schmidt-sebastian left a comment
schmidt-sebastian left a comment There was a problem hiding this comment.
This looks good! Some nits.
| for (Map.Entry<String, Object> entry : map.entrySet()) { | ||
| Value encodedValue = encodeValue(path.append(entry.getKey()), entry.getValue(), options); | ||
| Value encodedValue = | ||
| encodeValue(path.append(entry.getKey(), false), entry.getValue(), options); |
Contributor
There was a problem hiding this comment.
Suggested change
| encodeValue(path.append(entry.getKey(), false), entry.getValue(), options); | |
| encodeValue(path.append(entry.getKey(), /* splitPath= */ false), entry.getValue(), options); |
I generally prefer these inline comments for non-descriptive values.
| FieldPath path = FieldPath.of("a.b", "c.d"); | ||
| documentReference.update(path, FieldValue.delete()).get(); | ||
| CommitRequest expectedCommit = | ||
| commit(update(new HashMap<String, Value>(), Arrays.asList("`a.b`.`c.d`"))); |
Contributor
There was a problem hiding this comment.
Suggested change
| commit(update(new HashMap<String, Value>(), Arrays.asList("`a.b`.`c.d`"))); | |
| commit(update(Collections.<String, Value>emptyMap(), Collections.singletonList("`a.b`.`c.d`"))); |
Comment on lines 1278 to 1279
| Map<String, Object> dotKeyMap = new HashMap<>(); | ||
| dotKeyMap.put("a.b", SINGLE_FILED_MAP_WITH_DOT); |
Contributor
There was a problem hiding this comment.
Suggested change
| Map<String, Object> dotKeyMap = new HashMap<>(); | |
| dotKeyMap.put("a.b", SINGLE_FILED_MAP_WITH_DOT); | |
| Map<String, Object> dotKeyMap = map(""a.b"", SINGLE_FILED_MAP_WITH_DOT); |
| documentReference.set(dotKeyMap).get(); | ||
| DocumentSnapshot documentSnapshots = documentReference.get().get(); | ||
| assertEquals(SINGLE_FILED_MAP_WITH_DOT, documentSnapshots.getData().get("a.b")); | ||
| FieldPath path = FieldPath.of("a.b", "c.d"); |
Contributor
There was a problem hiding this comment.
Add empty line above.
Comment on lines 1287 to 1294
| Map<String, Object> nestedMap = new HashMap<>(); | ||
| nestedMap.put("e", SINGLE_FILED_MAP_WITH_DOT); | ||
| dotKeyMap.put("a.b", nestedMap); | ||
| documentReference.set(dotKeyMap).get(); | ||
| path = FieldPath.of("a.b", "e", "c.d"); | ||
| documentReference.update(path, FieldValue.delete()).get(); | ||
| documentSnapshots = documentReference.get().get(); | ||
| assertNull(documentSnapshots.getData().get("c.d")); |
Contributor
There was a problem hiding this comment.
I think you can delete this part as it doesn't expand on the tests coverage.
schmidt-sebastian changed the title 
schmidt-sebastian approved these changes Jul 16, 2020
gcf-merge-on-green bot pushed a commit that referenced this pull request Jul 20, 2020
🤖 I have created a release \*beep\* \*boop\* --- ### [1.35.2](https://www.github.com/googleapis/java-firestore/compare/v1.35.1...v1.35.2) (2020-07-16) ### Bug Fixes * add Internal#autoId() ([#292](https://www.github.com/googleapis/java-firestore/issues/292)) ([b91c57c](https://www.github.com/googleapis/java-firestore/commit/b91c57c4b2d3e92478ceaa1a39d467c40e1344dc)) * add support for deleting nested fields that contain periods ([#295](https://www.github.com/googleapis/java-firestore/issues/295)) ([84f602e](https://www.github.com/googleapis/java-firestore/commit/84f602ef8be67e5748b77e549d46ea53d0c74335)) * use test credentials when connecting to the Emulator from the Firebase Admin SDK ([#296](https://www.github.com/googleapis/java-firestore/issues/296)) ([a0a6e80](https://www.github.com/googleapis/java-firestore/commit/a0a6e806217693fc62a4cf432354c76e719aa140)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.3 ([#289](https://www.github.com/googleapis/java-firestore/issues/289)) ([2ddb8f1](https://www.github.com/googleapis/java-firestore/commit/2ddb8f133dd3bf31d28bf6bd67cddf8ba2e8846b)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Fixes #288