Skip to content

Commit fe039c3

Browse files
authored
Split UserDataConverter in two (#21)
* Split UserDataConverter in two Splits ParseAccumulator from ParseContext and moves shared user data classes like ParsedSetData and ParsedUpdateData to core. This matches the reorganization in firebase/firebase-ios-sdk#1823 where the changes have a more direct benefit. This change mostly just keeps the ports in sync.
1 parent cdeda33 commit fe039c3

File tree

8 files changed

+439
-295
lines changed

8 files changed

+439
-295
lines changed

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.google.firebase.firestore.Transaction.Function;
3636
import com.google.firebase.firestore.testutil.IntegrationTestUtil;
3737
import com.google.firebase.firestore.util.Consumer;
38-
import java.util.Arrays;
3938
import java.util.Date;
4039
import java.util.List;
4140
import java.util.Map;
@@ -44,6 +43,7 @@
4443
import org.junit.runner.RunWith;
4544

4645
// NOTE: The SDK has exhaustive nullability checks, but we don't exhaustively test them. :-)
46+
@SuppressWarnings("ConstantConditions")
4747
@RunWith(AndroidJUnit4.class)
4848
public class ValidationTest {
4949

@@ -387,9 +387,8 @@ public void arrayTransformsRejectArrays() {
387387
DocumentReference doc = testDocument();
388388
// This would result in a directly nested array which is not supported.
389389
String reason = "Invalid data. Nested arrays are not supported";
390-
expectError(() -> doc.set(map("x", FieldValue.arrayUnion(1, Arrays.asList("nested")))), reason);
391-
expectError(
392-
() -> doc.set(map("x", FieldValue.arrayRemove(1, Arrays.asList("nested")))), reason);
390+
expectError(() -> doc.set(map("x", FieldValue.arrayUnion(1, asList("nested")))), reason);
391+
expectError(() -> doc.set(map("x", FieldValue.arrayRemove(1, asList("nested")))), reason);
393392
}
394393

395394
@Test

firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import com.google.android.gms.tasks.Tasks;
2727
import com.google.firebase.annotations.PublicApi;
2828
import com.google.firebase.firestore.FirebaseFirestoreException.Code;
29-
import com.google.firebase.firestore.UserDataConverter.ParsedDocumentData;
30-
import com.google.firebase.firestore.UserDataConverter.ParsedUpdateData;
3129
import com.google.firebase.firestore.core.EventManager.ListenOptions;
3230
import com.google.firebase.firestore.core.QueryListener;
31+
import com.google.firebase.firestore.core.UserData.ParsedSetData;
32+
import com.google.firebase.firestore.core.UserData.ParsedUpdateData;
3333
import com.google.firebase.firestore.core.ViewSnapshot;
3434
import com.google.firebase.firestore.model.Document;
3535
import com.google.firebase.firestore.model.DocumentKey;
@@ -166,7 +166,7 @@ public Task<Void> set(@NonNull Map<String, Object> data) {
166166
public Task<Void> set(@NonNull Map<String, Object> data, @NonNull SetOptions options) {
167167
checkNotNull(data, "Provided data must not be null.");
168168
checkNotNull(options, "Provided options must not be null.");
169-
ParsedDocumentData parsed =
169+
ParsedSetData parsed =
170170
options.isMerge()
171171
? firestore.getDataConverter().parseMergeData(data, options.getFieldMask())
172172
: firestore.getDataConverter().parseSetData(data);

firebase-firestore/src/main/java/com/google/firebase/firestore/Transaction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.google.android.gms.tasks.Task;
2222
import com.google.android.gms.tasks.Tasks;
2323
import com.google.firebase.annotations.PublicApi;
24-
import com.google.firebase.firestore.UserDataConverter.ParsedDocumentData;
25-
import com.google.firebase.firestore.UserDataConverter.ParsedUpdateData;
24+
import com.google.firebase.firestore.core.UserData.ParsedSetData;
25+
import com.google.firebase.firestore.core.UserData.ParsedUpdateData;
2626
import com.google.firebase.firestore.model.Document;
2727
import com.google.firebase.firestore.model.MaybeDocument;
2828
import com.google.firebase.firestore.model.NoDocument;
@@ -89,7 +89,7 @@ public Transaction set(
8989
firestore.validateReference(documentRef);
9090
checkNotNull(data, "Provided data must not be null.");
9191
checkNotNull(options, "Provided options must not be null.");
92-
ParsedDocumentData parsed =
92+
ParsedSetData parsed =
9393
options.isMerge()
9494
? firestore.getDataConverter().parseMergeData(data, options.getFieldMask())
9595
: firestore.getDataConverter().parseSetData(data);

0 commit comments

Comments
 (0)