Fixed JSON parsing

Author: Robert Winkler

kotlin-wot/src/main/kotlin/thing/ConsumedThing.kt

@@ -1,9 +1,6 @@
 package ai.ancf.lmos.wot.thing
 
 import ai.ancf.lmos.wot.Servient
-import ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing.ContentCodecException
-import ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing.ContentManager
-import ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing.UriTemplate
 import ai.ancf.lmos.wot.thing.action.ConsumedThingException
 import ai.ancf.lmos.wot.thing.form.Form
 import ai.ancf.lmos.wot.thing.form.Operation

kotlin-wot/src/main/kotlin/ai/ancf/lmos/wot/thing/ContentManager.kt renamed to kotlin-wot/src/main/kotlin/thing/ContentManager.kt

@@ -1,4 +1,4 @@
-package ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing
+package ai.ancf.lmos.wot.thing
 
 import ai.ancf.lmos.wot.ServientException
 import ai.ancf.lmos.wot.thing.schema.DataSchema

kotlin-wot/src/main/kotlin/ai/ancf/lmos/wot/thing/UriTemplate.kt renamed to kotlin-wot/src/main/kotlin/thing/UriTemplate.kt

@@ -1,4 +1,4 @@
-package ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing
+package ai.ancf.lmos.wot.thing
 
 class UriTemplate {
     fun expand(parameters: Map<String, Any>): String {

kotlin-wot/src/main/kotlin/thing/action/ConsumedThingAction.kt

@@ -1,13 +1,13 @@
 package ai.ancf.lmos.wot.thing.action
 
 import ai.ancf.lmos.wot.ServientException
-import ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing.ContentCodecException
-import ai.ancf.lmos.wot.ai.ancf.lmos.wot.thing.ContentManager
-import ai.ancf.lmos.wot.thing.schema.ActionAffordance
 import ai.ancf.lmos.wot.thing.ConsumedThing
+import ai.ancf.lmos.wot.thing.ContentCodecException
+import ai.ancf.lmos.wot.thing.ContentManager
 import ai.ancf.lmos.wot.thing.Thing
 import ai.ancf.lmos.wot.thing.form.Form
 import ai.ancf.lmos.wot.thing.form.Operation
+import ai.ancf.lmos.wot.thing.schema.ActionAffordance
 import ai.anfc.lmos.wot.binding.Content
 import ai.anfc.lmos.wot.binding.ProtocolClient
 import com.fasterxml.jackson.annotation.JsonIgnore

kotlin-wot/src/main/kotlin/thing/action/ExposedThingAction.kt

@@ -12,17 +12,18 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include.*
 import com.fasterxml.jackson.annotation.JsonProperty
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import org.slf4j.LoggerFactory
 
 @Serializable
 data class ExposedThingAction<I, O> @JsonCreator constructor(
     private val action: ThingAction<I, O> = ThingAction(),
     @JsonIgnore
     private val thing: Thing = Thing(),
-    @Transient private val state: ActionState<I, O> = ActionState()
+    private val state: ActionState<I, O> = ActionState()
 ) : ActionAffordance<I, O> by action {
 
+
+
     /**
      * Invokes the method and executes the handler defined in [.state]. `input`
      * contains the request payload. `options` can contain additional data (for example,
@@ -44,7 +45,7 @@ data class ExposedThingAction<I, O> @JsonCreator constructor(
             )
             try {
                 // Use the handler as a suspending function directly
-                state.handler.invoke(input, options).also { output ->
+                state.handler.handle(input, options).also { output ->
                     if (output == null) {
                         log.warn(
                             "'{}': Called registered handler for Action '{}' returned null. This can cause problems.",
@@ -128,4 +129,6 @@ data class ThingAction<I, O>(
     override var titles: MutableMap<String, String>? = null
 ) : ActionAffordance<I, O>
 
-typealias ActionHandler<I, O> = suspend (input: I, options: Map<String, Map<String, Any>>) -> O?
+fun interface ActionHandler<I, O> {
+    suspend fun handle(input: I, options: Map<String, Map<String, Any>>): O?
+}

kotlin-wot/src/main/kotlin/thing/property/ExposedThingProperty.kt

@@ -31,14 +31,13 @@ sealed class ExposedThingProperty<T>(
     private val property: ThingProperty<T>,
     @JsonIgnore
     private val thing: Thing = Thing(),
-    @JsonIgnore
     private val state: PropertyState<T> = PropertyState()
 ) : PropertyAffordance<T> by property {
 
     suspend fun read(): T? {
         log.debug("'{}' calls registered readHandler for Property '{}'", thing.id, title)
         return try {
-            state.readHandler?.invoke()?.also { state.setValue(it) } ?: state.value
+            state.readHandler?.handle()?.also { state.setValue(it) } ?: state.value
         } catch (e: Exception) {
             log.error("Error while reading property '{}': {}", title, e.message)
             throw e
@@ -49,7 +48,7 @@ sealed class ExposedThingProperty<T>(
         log.debug("'{}' calls registered writeHandler for Property '{}'", thing.id, title)
         return try {
             if (state.writeHandler != null) {
-                val customValue = state.writeHandler.invoke(value)
+                val customValue = state.writeHandler.handle(value)
                 state.setValue(customValue)
                 log.debug(
                     "'{}' write handler for Property '{}' sets custom value '{}'",
@@ -143,5 +142,11 @@ fun exposedObjectProperty(initializer: ExposedObjectProperty.() -> Unit): Expose
     return ExposedObjectProperty().apply(initializer)
 }
 
-typealias ReadHandler<T> = suspend () -> T?
-typealias WriteHandler<T> = suspend (T) -> T?
+
+fun interface ReadHandler<T> {
+    suspend fun handle(): T?
+}
+
+fun interface WriteHandler<T> {
+    suspend fun handle(input: T): T?
+}

kotlin-wot/src/test/kotlin/thing/action/ExposedThingActionTest.kt

@@ -72,14 +72,10 @@ class ExposedThingActionTest {
                     }"""
 
         val parsedThingAction = JsonMapper.instance.readValue<ExposedThingAction<String, String>>(json)
-        val action = ThingAction(
-            title = "title",
-            description = "blabla",
-            input = StringSchema(),
-            output = StringSchema()
-        )
-        val exposedThingAction = ExposedThingAction(action, thing)
-        assertEquals(exposedThingAction, parsedThingAction)
+        assertEquals("title", parsedThingAction.title)
+        assertEquals("blabla", parsedThingAction.description)
+        assertIs<StringSchema>(parsedThingAction.input)
+        assertIs<StringSchema>(parsedThingAction.output)
     }
 
     @Test
@@ -98,7 +94,7 @@ class ExposedThingActionTest {
 
     @Test
     fun invokeWithHandlerShouldCallHandler(): Unit = runTest {
-        val handler: (suspend (String, Map<String, Map<String, Any>>) -> String) = mockk()
+        val handler: ActionHandler<String, String> = mockk()
 
         every { state.handler } returns handler
 
@@ -108,15 +104,15 @@ class ExposedThingActionTest {
             state
         )
 
-        coEvery { handler("test", any()) } returns "Result"
+        coEvery { handler.handle("test", any()) } returns "Result"
 
         val result = exposedThingAction.invokeAction("test")
         assertEquals("Result", result)
     }
 
     @Test
     fun invokeWithBrokenHandlerShouldThrowException(): Unit = runTest {
-        val handler: (suspend (String, Map<String, Map<String, Any>>) -> String) = mockk()
+        val handler: ActionHandler<String, String> = mockk()
 
         every { state.handler } returns handler
 
@@ -126,7 +122,7 @@ class ExposedThingActionTest {
             state
         )
 
-        coEvery { handler("test", any()) } throws RuntimeException()
+        coEvery { handler.handle("test", any()) } throws RuntimeException()
 
         assertFailsWith<RuntimeException> {
             exposedThingAction.invokeAction("test")

kotlin-wot/src/test/kotlin/thing/property/ExposedThingPropertyTest.kt

@@ -10,36 +10,38 @@ import io.mockk.*
 import kotlinx.coroutines.test.runTest
 import net.javacrumbs.jsonunit.assertj.JsonAssertions
 import net.javacrumbs.jsonunit.core.Option
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 import java.io.IOException
+import kotlin.test.BeforeTest
+import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class ExposedThingPropertyTest {
 
     private lateinit var thing: Thing
     private lateinit var state: PropertyState<String>
 
-    @BeforeEach
+    @BeforeTest
     fun setUp() {
         thing = Thing(id = "testThing")
         state = mockk()
+
+
     }
 
     @Test
     fun testEquals() {
-        val property1 = ExposedStringProperty(thing = thing, state = state, property = stringProperty { title = "title" })
-        val property2 = ExposedStringProperty(thing = thing, state = state, property = stringProperty { title = "title" })
+        val property1 = ExposedStringProperty(thing = thing, property = stringProperty { title = "title" })
+        val property2 = ExposedStringProperty(thing = thing, property = stringProperty { title = "title" })
         assertEquals(property1, property2)
     }
 
     @Test
     fun testHashCode() {
         val thing = Thing(id = "Foo")
 
-        val property1 = ExposedStringProperty(thing = thing, state = state, property = stringProperty { title = "title" }).hashCode()
-        val property2 = ExposedStringProperty(thing = thing, state = state, property = stringProperty { title = "title" }).hashCode()
+        val property1 = ExposedStringProperty(thing = thing, property = stringProperty { title = "title" }).hashCode()
+        val property2 = ExposedStringProperty(thing = thing, property = stringProperty { title = "title" }).hashCode()
         assertEquals(property1, property2)
     }
 
@@ -63,13 +65,10 @@ class ExposedThingPropertyTest {
         val json = """{"@type":"saref:Temperature","description":"bla bla","type":"integer","observable":true,"readOnly":true}"""
 
         val parsedProperty = JsonMapper.instance.readValue<ExposedIntProperty>(json)
-        val property = exposedIntProperty {
-            objectType=Type("saref:Temperature")
-            description = "bla bla"
-            observable=true
-            readOnly=true
-        }
-        assertEquals(property, parsedProperty)
+        assertEquals(Type("saref:Temperature"), parsedProperty.objectType)
+        assertEquals("bla bla", parsedProperty.description)
+        assertEquals(true, parsedProperty.observable)
+        assertEquals(true, parsedProperty.readOnly)
     }
 
     @Test
@@ -109,7 +108,7 @@ class ExposedThingPropertyTest {
 
         val exposedProperty = ExposedStringProperty(thing = thing, state = state)
 
-        assertThrows<IOException> { exposedProperty.read() }
+        assertFailsWith<IOException> { exposedProperty.read() }
     }
 
     @Test
@@ -151,7 +150,7 @@ class ExposedThingPropertyTest {
 
         val exposedProperty = ExposedStringProperty(thing = thing, state = state)
 
-        assertThrows<IOException> { exposedProperty.write("test") }
+        assertFailsWith<IOException> { exposedProperty.write("test") }
     }
 
 }