Code changes to for new jackson

ostelco · Oct 15, 2019 · 1947b42 · 1947b42
1 parent fd607a7
commit 1947b42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -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
@@ -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>>() {}))
 }
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
@@ -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"])
     }