Simplify methods.

Author: corrado4eyes

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

@@ -110,11 +110,7 @@ actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
-
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         if (merge) {
             android.set(documentRef.android, result, SetOptions.merge())
         } else {
@@ -149,11 +145,7 @@ actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
-
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         return android.update(documentRef.android, result).let { this }
     }
 

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

@@ -101,11 +101,7 @@ actual class WriteBatch(val ios: FIRWriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
-
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         ios.setData(result as Map<Any?, *>, documentRef.ios, merge)
         return this
     }
@@ -132,10 +128,7 @@ actual class WriteBatch(val ios: FIRWriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         return ios.updateData(result as Map<Any?, *>, documentRef.ios).let { this }
     }
 

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

@@ -97,11 +97,7 @@ actual class WriteBatch(val js: firebase.firestore.WriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
-
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         if (merge) {
             js.set(documentRef.js, result, json("merge" to merge))
         } else {
@@ -134,11 +130,7 @@ actual class WriteBatch(val js: firebase.firestore.WriteBatch) {
         val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
         val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = if (serializedFieldAndValues != null)
-            serializedItem + serializedFieldAndValues
-        else
-            serializedItem
-
+        val result = serializedItem + (serializedFieldAndValues ?: emptyMap())
         return js.update(documentRef.js, result).let { this }
     }