refactor json utils

wordpress-mobile · Jun 20, 2023 · a4e1737 · a4e1737
1 parent db3112a
commit a4e1737
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/...ins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt b/...ins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
@@ -2,36 +2,26 @@ package org.wordpress.android.fluxc.model
 
 import com.google.gson.Gson
 import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import org.wordpress.android.fluxc.model.WCProductModel.AddOnsMetadataKeys
 import org.wordpress.android.fluxc.model.WCProductModel.QuantityRulesMetadataKeys
-import org.wordpress.android.fluxc.utils.JsonStringUtils
-import org.wordpress.android.fluxc.utils.isJsonEmptyElement
+import org.wordpress.android.fluxc.utils.EMPTY_JSON_ARRAY
+import org.wordpress.android.fluxc.utils.isElementNullOrEmpty
 import javax.inject.Inject
 
 class StripProductMetaData @Inject internal constructor(private val gson: Gson) {
     operator fun invoke(metadata: String?): String {
-        if (metadata.isNullOrEmpty()) return JsonStringUtils.EMPTY.ARRAY
+        if (metadata.isNullOrEmpty()) return EMPTY_JSON_ARRAY
 
         return gson.fromJson(metadata, JsonArray::class.java)
             .mapNotNull { it as? JsonObject }
             .asSequence()
             .filter { jsonObject ->
-                val isNullOrEmpty = isElementNullOrEmpty(jsonObject[WCMetaData.VALUE])
+                val isNullOrEmpty = jsonObject[WCMetaData.VALUE].isElementNullOrEmpty()
                 jsonObject[WCMetaData.KEY]?.asString.orEmpty() in SUPPORTED_KEYS && isNullOrEmpty.not()
             }.toList()
             .takeIf { it.isNotEmpty() }
-            ?.let { gson.toJson(it) } ?: JsonStringUtils.EMPTY.ARRAY
-    }
-
-    private fun isElementNullOrEmpty(jsonElement: JsonElement?): Boolean {
-        return jsonElement?.let {
-            if (it.isJsonNull) return@let true
-
-            val valueString = gson.toJson(jsonElement)
-            valueString.isJsonEmptyElement()
-        } ?: true
+            ?.let { gson.toJson(it) } ?: EMPTY_JSON_ARRAY
     }
 
     companion object {

diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonStringUtils.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonStringUtils.kt
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonUtils.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonUtils.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonElement
+
+const val EMPTY_JSON_ARRAY = "[]"
+
+fun JsonElement?.isElementNullOrEmpty(): Boolean {
+    return this?.let {
+        if (it.isJsonNull) return@let true
+        when{
+            this.isJsonObject -> this.asJsonObject.size() == 0
+            this.isJsonArray -> this.asJsonArray.size()== 0
+            this.isJsonPrimitive && this.asJsonPrimitive.isString -> this.asString.isEmpty()
+            this.isJsonNull -> true
+            else -> false
+        }
+    } ?: true
+}
diff --git a/...ava/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt b/...ava/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
@@ -7,7 +7,7 @@ import org.assertj.core.api.Assertions
 import org.junit.Test
 import org.wordpress.android.fluxc.model.StripProductMetaData
 import org.wordpress.android.fluxc.model.WCMetaData
-import org.wordpress.android.fluxc.utils.JsonStringUtils
+import org.wordpress.android.fluxc.utils.EMPTY_JSON_ARRAY
 
 class StripProductMetaDataTest {
     private val gson = Gson()
@@ -34,7 +34,7 @@ class StripProductMetaDataTest {
         val metadata = getOneItemMetadata(supportedKey, value)
         val result = sut.invoke(metadata)
 
-        Assertions.assertThat(result).isEqualTo(JsonStringUtils.EMPTY.ARRAY)
+        Assertions.assertThat(result).isEqualTo(EMPTY_JSON_ARRAY)
     }
 
     @Test
@@ -45,7 +45,7 @@ class StripProductMetaDataTest {
         val metadata = getOneItemMetadata(supportedKey, value)
         val result = sut.invoke(metadata)
 
-        Assertions.assertThat(result).isEqualTo(JsonStringUtils.EMPTY.ARRAY)
+        Assertions.assertThat(result).isEqualTo(EMPTY_JSON_ARRAY)
     }
 
     @Test
@@ -66,7 +66,7 @@ class StripProductMetaDataTest {
     @Test
     fun `when metadata is null, then empty array is return`() {
         val result = sut.invoke(null)
-        Assertions.assertThat(result).isEqualTo(JsonStringUtils.EMPTY.ARRAY)
+        Assertions.assertThat(result).isEqualTo(EMPTY_JSON_ARRAY)
     }
 
     private fun getOneItemMetadata(itemKey: String, itemValue: String?): String {