removed DocumentSnapshot.dataMap() (#250)

Author: suntrix

firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -415,9 +415,6 @@ actual class DocumentSnapshot(val android: com.google.firebase.firestore.Documen
     actual fun <T> data(strategy: DeserializationStrategy<T>, serverTimestampBehavior: ServerTimestampBehavior): T =
         decode(strategy, android.getData(serverTimestampBehavior.toAndroid()))
 
-    actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
-        android.getData(serverTimestampBehavior.toAndroid()) ?: emptyMap()
-
     actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior): T =
         decode(value = android.get(field, serverTimestampBehavior.toAndroid()))
 

firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -196,8 +196,6 @@ expect class DocumentSnapshot {
     inline fun <reified T: Any> data(serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): T
     fun <T> data(strategy: DeserializationStrategy<T>,  serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): T
 
-    fun dataMap(serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): Map<String, Any?>
-
     val exists: Boolean
     val id: String
     val reference: DocumentReference

firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -160,7 +160,6 @@ class FirebaseFirestoreTest {
         val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
         assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
         assertNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.NONE))
-        assertNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.NONE)["time"])
     }
 
     @Test
@@ -181,7 +180,6 @@ class FirebaseFirestoreTest {
         val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
         assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
         assertNotNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.ESTIMATE))
-        assertNotNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.ESTIMATE)["time"])
         assertNotEquals(0.0, pendingWritesSnapshot.data(FirestoreTest.serializer(), ServerTimestampBehavior.ESTIMATE).time)
     }
 
@@ -203,7 +201,6 @@ class FirebaseFirestoreTest {
         val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
         assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
         assertNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.PREVIOUS))
-        assertNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.PREVIOUS)["time"])
     }
 
     @Test
@@ -223,23 +220,6 @@ class FirebaseFirestoreTest {
         assertEquals("AutoId", resultDoc.get("prop1"))
     }
 
-    @Test
-    fun testDataMap() = runTest {
-        val doc = Firebase.firestore
-            .collection("testDataMap")
-            .document
-
-        doc.set(FirestoreTest.serializer(), FirestoreTest("dataMap", 123.45))
-
-        val resultDoc = Firebase.firestore
-            .collection("testDataMap")
-            .document(doc.id)
-            .get()
-
-        assertEquals(true, resultDoc.exists)
-        assertEquals(mapOf("prop1" to "dataMap", "time" to 123.45), resultDoc.dataMap())
-    }
-
     private suspend fun setupFirestoreData() {
         Firebase.firestore.collection("FirebaseFirestoreTest")
             .document("one")

firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -388,12 +388,6 @@ actual class DocumentSnapshot(val ios: FIRDocumentSnapshot) {
         return decode(strategy, data?.mapValues { (_, value) -> value?.takeIf { it !is NSNull } })
     }
 
-    actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
-        ios.dataWithServerTimestampBehavior(serverTimestampBehavior.toIos())
-            ?.map { (key, value) -> key.toString() to value?.takeIf { it !is NSNull } }
-            ?.toMap()
-            ?: emptyMap()
-
     actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior): T {
         val value = ios.valueForField(field, serverTimestampBehavior.toIos())?.takeIf { it !is NSNull }
         return decode(value)

firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -393,9 +393,6 @@ actual class DocumentSnapshot(val js: firebase.firestore.DocumentSnapshot) {
     actual fun <T> data(strategy: DeserializationStrategy<T>, serverTimestampBehavior: ServerTimestampBehavior): T =
         rethrow { decode(strategy, js.data(getTimestampsOptions(serverTimestampBehavior))) }
 
-    actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
-        rethrow { mapOf(js.data(getTimestampsOptions(serverTimestampBehavior)).asDynamic()) }
-
     actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior) =
         rethrow { decode<T>(value = js.get(field, getTimestampsOptions(serverTimestampBehavior))) }