ECWID-144513 safe deserializeOrNull implementation

Author: bubalekh

src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt

@@ -23,8 +23,6 @@ import com.ecwid.apiclient.v3.responsefields.responseFieldsOf
 import com.ecwid.apiclient.v3.util.buildEndpointPath
 import com.ecwid.apiclient.v3.util.createSecurePatterns
 import com.ecwid.apiclient.v3.util.maskLogString
-import com.google.gson.JsonParser
-import com.google.gson.JsonSyntaxException
 import java.net.URI
 import java.util.*
 import java.util.logging.Level
@@ -198,9 +196,8 @@ class ApiClientHelper private constructor(
 				try {
 					val responseBody = responseBytes.asString()
 					logErrorResponseIfNeeded(requestId, requestTime, httpResponse.statusCode, responseBody)
-					// Because of a html-based balancer error we should check responseBody string to be an actual json object
-					val ecwidError = if (responseBody.isNotBlank() && isJsonObject(responseBody)) {
-						jsonTransformer.deserialize(responseBody, EcwidApiError::class.java)
+					val ecwidError = if (responseBody.isNotBlank()) {
+						jsonTransformer.deserializeOrNull(responseBody, EcwidApiError::class.java)
 					} else {
 						null
 					}
@@ -556,11 +553,3 @@ private fun createAdditionalDataPolymorphicType(): PolymorphicType<FetchedReport
 		)
 	)
 }
-
-internal fun isJsonObject(input: String?): Boolean {
-	return try {
-		input?.let { JsonParser.parseString(it).isJsonObject } ?: false
-	} catch (_: JsonSyntaxException) {
-		false
-	}
-}

src/main/kotlin/com/ecwid/apiclient/v3/jsontransformer/JsonTransformer.kt

@@ -2,5 +2,6 @@ package com.ecwid.apiclient.v3.jsontransformer
 
 interface JsonTransformer {
 	fun serialize(src: Any?, srcExt: Any? = null): String
-	fun <V> deserialize(json: String, clazz: Class<V>): V?
+	fun <V> deserialize(json: String, clazz: Class<V>): V
+	fun <V> deserializeOrNull(json: String, clazz: Class<V>): V?
 }

src/main/kotlin/com/ecwid/apiclient/v3/jsontransformer/gson/GsonTransformer.kt

@@ -36,13 +36,21 @@ class GsonTransformer(polymorphicTypes: List<PolymorphicType<*>>) : JsonTransfor
 		}
 	}
 
-	override fun <V> deserialize(json: String, clazz: Class<V>): V? {
+	override fun <V> deserialize(json: String, clazz: Class<V>): V {
 		try {
 			return gson.fromJson(json, clazz)
 		} catch (e: JsonParseException) {
 			throw JsonDeserializationException(e.message, e)
 		}
 	}
+
+	override fun <V> deserializeOrNull(json: String, clazz: Class<V>): V? {
+		return try {
+			return gson.fromJson(json, clazz)
+		} catch (e: JsonParseException) {
+			null
+		}
+	}
 }
 
 private fun JsonObject.mergeJsonObject(from: JsonObject) {

src/test/kotlin/com/ecwid/apiclient/v3/ApiClientHelperUnitTest.kt

@@ -230,6 +230,13 @@ internal class GsonTransformerTest {
 		)
 	}
 
+	@Test
+	fun `deserializeOrNull of broken ParsedResponseWithExt`() {
+		val json = "'testField': {'baseField': 'base', 'extField': 'ext'}}"
+		val deserializedValue = transformer.deserializeOrNull(json, TestParsedResponseWithExt::class.java)
+		assertEquals(null, deserializedValue)
+	}
+
 }
 
 private fun assertJsonEquals(expected: String, actual: String) {