Update/decode maps support

config.gradle

@@ -1,7 +1,7 @@
 ext {
     def major = 0
     def minor = 0
-    def patch = 5
+    def patch = 6
 
     buildConfig = [
             "minSdk"    : 21,
@@ -14,4 +14,4 @@ ext {
             "version"    : "$major.$minor.$patch",
             "versionCode": major * 100 * 100 + minor * 100 + patch
     ]
-}
+}

halley-core/src/main/kotlin/com/infinum/halley/core/serializers/primitive/delegates/PrimitiveDeserializerDelegate.kt

@@ -10,8 +10,10 @@ import com.infinum.halley.core.serializers.hal.models.HalResource
 import com.infinum.halley.core.serializers.shared.delegates.DeserializerDelegate
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
+import kotlinx.serialization.SerializationException
 import kotlinx.serialization.builtins.ArraySerializer
 import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.SetSerializer
 import kotlinx.serialization.json.JsonDecoder
 import kotlinx.serialization.json.JsonNull
@@ -53,6 +55,7 @@ internal class PrimitiveDeserializerDelegate<T : HalResource>(
                 result,
                 jsonObject[name]?.jsonPrimitive?.contentOrNull
             )
+            Map::class -> decodeMap()
             else -> if (property.isCollection()) {
                 decodeCollection()
             } else {
@@ -106,4 +109,19 @@ internal class PrimitiveDeserializerDelegate<T : HalResource>(
 
         property.setField(result, value)
     }
+
+    private fun decodeMap() {
+        val mapType = property.returnType
+        val keyType = mapType.arguments[0].type ?: throw SerializationException("Cannot determine map key type")
+        val valueType = mapType.arguments[1].type ?: throw SerializationException("Cannot determine map value type")
+
+        val value = decoder.json.decodeFromJsonElement(
+            MapSerializer(
+                decoder.serializersModule.serializer(keyType),
+                decoder.serializersModule.serializer(valueType)
+            ),
+            jsonObject[name]?.jsonObject ?: JsonObject(emptyMap())
+        )
+        property.setField(result, value)
+    }
 }

halley-core/src/main/resources/META-INF/proguard/halley.pro

@@ -43,4 +43,6 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
 -dontwarn org.joda.**
--dontwarn org.slf4j.**
+-dontwarn org.slf4j.**
+
+-keep class * extends com.infinum.halley.core.serializers.hal.models.HalResource { *; }

sample/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath libs.tools.gradle
-        // classpath libs.library.plugin
+        classpath libs.library.plugin
     }
 }
 
@@ -15,7 +15,7 @@ plugins {
     alias libs.plugins.kotlin.android
 }
 
-// apply plugin: "com.infinum.halley.plugin"
+apply plugin: "com.infinum.halley.plugin"
 
 android {
     compileSdkVersion buildConfig.compileSdk
@@ -70,13 +70,13 @@ android {
 }
 
 dependencies {
-//    implementation libs.library.retrofit
-//    implementation libs.library.ktor
-    implementation project(":halley-core")
-    implementation project(":halley-retrofit")
-    implementation project(":halley-ktor")
+    implementation libs.library.retrofit
+    implementation libs.library.ktor
+//    implementation project(":halley-core")
+//    implementation project(":halley-retrofit")
+//    implementation project(":halley-ktor")
 
-//    implementation libs.kotlin.core
+    implementation libs.kotlin.core
     implementation libs.bundles.androidx
     implementation libs.material
 
@@ -88,4 +88,4 @@ dependencies {
 
     implementation libs.bundles.coroutines
     implementation libs.bundles.rxjava
-}
+}

sample/src/main/kotlin/com/infinum/halley/sample/data/models/deserialization/ProfileResource.kt

@@ -31,7 +31,13 @@ data class ProfileResource(
     val user: UserResource? = null,
 
     @Transient
-    val age: Int = 40
+    val age: Int = 40,
+
+    @SerialName(value = "favouriteMeals")
+    val favouriteMeals: Map<String, String>? = null,
+
+    @SerialName(value = "categorizedAnimals")
+    val categorizedAnimals: Map<String, List<AnimalResource>>? = null
 
 ) : HalResource
 // CPD-ON

sample/src/main/resources/profile.json

@@ -14,6 +14,29 @@
   },
   "name": "Niko",
   "timezone": "Europe/Zagreb",
+  "favouriteMeals": {
+    "breakfast": "pancakes",
+    "lunch": "pasta",
+    "dinner": "lasagna"
+  },
+  "categorizedAnimals": {
+    "mammals": [
+      {
+        "name": "Lion",
+        "age": 3
+      },
+      {
+        "name": "Tiger",
+        "type": "2"
+      }
+    ],
+    "birds": [
+      {
+        "name": "Eagle",
+        "age": 5
+      }
+    ]
+  },
   "_links": {
     "self": {
       "href": "http://localhost:8080/api/Profile/self"
@@ -22,4 +45,4 @@
       "href": "http://localhost:8080/api/Profile/block"
     }
   }
-}
+}