From 1947b42592cae01ef30ff03452d05a912346e475 Mon Sep 17 00:00:00 2001
From: Vihang Patil <vihang.patil@gmail.com>
Date: Tue, 15 Oct 2019 15:40:49 +0200
Subject: [PATCH] Code changes to for new jackson

---
 .../src/main/kotlin/org/ostelco/prime/store/datastore/Schema.kt | 2 +-
 .../src/main/kotlin/org/ostelco/ext/myinfo/JsonUtils.kt         | 2 +-
 .../test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data-store/src/main/kotlin/org/ostelco/prime/store/datastore/Schema.kt b/data-store/src/main/kotlin/org/ostelco/prime/store/datastore/Schema.kt
index d10d0b0bf..7167025f1 100644
--- a/data-store/src/main/kotlin/org/ostelco/prime/store/datastore/Schema.kt
+++ b/data-store/src/main/kotlin/org/ostelco/prime/store/datastore/Schema.kt
@@ -129,7 +129,7 @@ class EntityStore<E : Any>(
 
         // convert object to map of (field name, field value)
         // TODO: Fails to serialize datastore 'Value<*>' types such as 'StringValue'.
-        val map: MutableMap<String, Any?> = objectMapper.convertValue(entity, object : TypeReference<Map<String, Any?>>() {})
+        val map: Map<String, Any?> = objectMapper.convertValue(entity, object : TypeReference<Map<String, Any?>>() {})
 
         val keyFactory = parents.fold(
                 initial = datastore.newKeyFactory().setKind(entityClass.qualifiedName)
diff --git a/ext-myinfo-emulator/src/main/kotlin/org/ostelco/ext/myinfo/JsonUtils.kt b/ext-myinfo-emulator/src/main/kotlin/org/ostelco/ext/myinfo/JsonUtils.kt
index cc9c3f4ab..71392c3a9 100644
--- a/ext-myinfo-emulator/src/main/kotlin/org/ostelco/ext/myinfo/JsonUtils.kt
+++ b/ext-myinfo-emulator/src/main/kotlin/org/ostelco/ext/myinfo/JsonUtils.kt
@@ -5,5 +5,5 @@ import org.ostelco.prime.jsonmapper.objectMapper
 
 object JsonUtils {
     fun compactJson(json: String): String = objectMapper.writeValueAsString(
-            objectMapper.readValue<Map<String, String>>(json, object : TypeReference<Map<String, Any>>() {}))
+            objectMapper.readValue<Map<String, Any>>(json, object : TypeReference<Map<String, Any>>() {}))
 }
\ No newline at end of file
diff --git a/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt b/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt
index bc0fc24cf..1e3530ba0 100644
--- a/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt
+++ b/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt
@@ -191,7 +191,7 @@ class SchemaTest {
 
     @Test
     fun `json to map`() {
-        val map = objectMapper.readValue<Map<String, String>>("""{"label":"3GB for 300 NOK"}""", object : TypeReference<LinkedHashMap<String, String>>() {})
+        val map = objectMapper.readValue<Map<String, String>>("""{"label":"3GB for 300 NOK"}""", object : TypeReference<Map<String, String>>() {})
         assertEquals("3GB for 300 NOK", map["label"])
     }