Merge pull request #186 from Ecwid/parsed-response-with-ext-deserialization

Added GSON deserializer for ParsedResponseWithExt class

Author: juvirez

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

@@ -2,11 +2,13 @@ package com.ecwid.apiclient.v3.jsontransformer.gson
 
 import com.ecwid.apiclient.v3.dto.product.result.GetProductFiltersResult.ProductFilters
 import com.ecwid.apiclient.v3.exception.JsonDeserializationException
+import com.ecwid.apiclient.v3.impl.ParsedResponseWithExt
 import com.ecwid.apiclient.v3.jsontransformer.JsonTransformer
 import com.ecwid.apiclient.v3.jsontransformer.PolymorphicType
 import com.ecwid.apiclient.v3.jsontransformer.gson.typeadapters.GsonNullableUpdatedValueTypeAdapterFactory
 import com.ecwid.apiclient.v3.jsontransformer.gson.typeadapters.GsonPolymorphicDeserializer
 import com.ecwid.apiclient.v3.jsontransformer.gson.typeadapters.GsonProductFiltersDeserializer
+import com.ecwid.apiclient.v3.jsontransformer.gson.typeadapters.ParsedResponseWithExtDeserializer
 import com.google.gson.*
 
 class GsonTransformer(polymorphicTypes: List<PolymorphicType<*>>) : JsonTransformer {
@@ -19,6 +21,7 @@ class GsonTransformer(polymorphicTypes: List<PolymorphicType<*>>) : JsonTransfor
 				gsonBuilder.registerTypeAdapter(polymorphType.rootClass, GsonPolymorphicDeserializer(polymorphType))
 			}
 			gsonBuilder.registerTypeAdapter(ProductFilters::class.java, GsonProductFiltersDeserializer())
+			gsonBuilder.registerTypeAdapter(ParsedResponseWithExt::class.java, ParsedResponseWithExtDeserializer())
 			gsonBuilder.registerTypeAdapterFactory(GsonNullableUpdatedValueTypeAdapterFactory)
 		}
 		.create()

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

@@ -0,0 +1,28 @@
+package com.ecwid.apiclient.v3.jsontransformer.gson.typeadapters
+
+import com.ecwid.apiclient.v3.impl.ParsedResponseWithExt
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+class ParsedResponseWithExtDeserializer : JsonDeserializer<ParsedResponseWithExt<*, *>> {
+
+	override fun deserialize(
+		json: JsonElement,
+		typeOfT: Type,
+		context: JsonDeserializationContext
+	): ParsedResponseWithExt<*, *> {
+		val actualTypeArguments = (typeOfT as ParameterizedType).actualTypeArguments
+
+		val baseResult: Any? = context.deserialize(json, actualTypeArguments[0])
+		val extResult: Any? = context.deserialize(json, actualTypeArguments[1])
+
+		return ParsedResponseWithExt(
+			baseResult = baseResult,
+			extResult = extResult,
+		)
+	}
+
+}

src/test/kotlin/com/ecwid/apiclient/v3/jsontransformer/gson/GsonTransformerTest.kt

@@ -3,6 +3,7 @@ package com.ecwid.apiclient.v3.jsontransformer.gson
 import com.ecwid.apiclient.v3.dto.common.NullableUpdatedValue
 import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder
 import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
+import com.ecwid.apiclient.v3.impl.ParsedResponseWithExt
 import com.google.gson.JsonParser
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
@@ -209,6 +210,26 @@ internal class GsonTransformerTest {
 			transformer.serialize(product, null)
 		)
 	}
+
+	@Test
+	fun `test deserialization of ParsedResponseWithExt`() {
+		val json = "{'testField': {'baseField': 'base', 'extField': 'ext'}}"
+		val deserializedValue = transformer.deserialize(json, TestParsedResponseWithExt::class.java)
+		assertEquals(
+			TestParsedResponseWithExt(
+				testField = ParsedResponseWithExt(
+					baseResult = TestParsedResponseWithExt.TestBaseResult(
+						baseField = "base"
+					),
+					extResult = TestParsedResponseWithExt.TestExtResult(
+						extField = "ext"
+					),
+				)
+			),
+			deserializedValue
+		)
+	}
+
 }
 
 private fun assertJsonEquals(expected: String, actual: String) {
@@ -231,3 +252,17 @@ private data class OrderItemExt(
 )
 
 private data class ComplexExtraField(val value: String? = null)
+
+private data class TestParsedResponseWithExt(
+	val testField: ParsedResponseWithExt<TestBaseResult, TestExtResult>
+) {
+
+	data class TestBaseResult(
+		val baseField: String
+	)
+
+	data class TestExtResult(
+		val extField: String
+	)
+
+}