Updated code

Robert Winkler · Robert Winkler · commit d7cf7dd84809 · 2024-11-06T15:17:16.000+01:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,6 @@ subprojects {
     version = "1.0-SNAPSHOT"
 
     dependencies {
-
         testImplementation(kotlin("test"))
         testImplementation ("org.jetbrains.kotlinx:kotlinx-coroutines-test")
         testImplementation("io.mockk:mockk:1.13.13")
diff --git a/kotlin-wot-binding-http/build.gradle.kts b/kotlin-wot-binding-http/build.gradle.kts
@@ -18,5 +18,5 @@ dependencies {
     implementation("io.ktor:ktor-server-auto-head-response")
     //implementation("io.insert-koin:koin-ktor:4.0.0")
     testImplementation("io.ktor:ktor-server-test-host")
-    testImplementation("org.slf4j:slf4j-simple:2.0.16")
+    testImplementation("ch.qos.logback:logback-classic:1.5.12")
 }
diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt
@@ -15,10 +15,10 @@ open class HttpProtocolClientFactory : ProtocolClientFactory {
         get() = HttpProtocolClient()
 
     override suspend fun init() {
-        TODO("Not yet implemented")
+       // TODO
     }
 
     override suspend fun destroy() {
-        TODO("Not yet implemented")
+        // TODO
     }
 }
diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt
@@ -5,9 +5,12 @@ import ai.ancf.lmos.wot.content.Content
 import ai.ancf.lmos.wot.content.ContentCodecException
 import ai.ancf.lmos.wot.content.ContentManager
 import ai.ancf.lmos.wot.thing.ExposedThing
+import ai.ancf.lmos.wot.thing.action.ExposedThingAction
 import ai.ancf.lmos.wot.thing.form.Form
 import ai.ancf.lmos.wot.thing.form.Operation
-import ai.ancf.lmos.wot.thing.schema.InteractionAffordance
+import ai.ancf.lmos.wot.thing.property.ExposedThingProperty
+import ai.ancf.lmos.wot.thing.property.ExposedThingProperty.*
+import ai.ancf.lmos.wot.thing.schema.*
 import ai.anfc.lmos.wot.binding.ProtocolServer
 import ai.anfc.lmos.wot.binding.ProtocolServerException
 import com.fasterxml.jackson.databind.DeserializationFeature
@@ -17,6 +20,7 @@ import io.ktor.serialization.jackson.*
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
+import io.ktor.server.plugins.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.request.*
 import io.ktor.server.routing.*
@@ -212,7 +216,15 @@ fun Application.setupRouting(servient: Servient) {
                                 val value = property.read()
                                 //contentType = getOrDefaultRequestContentType(call.request)
                                 //val content = ContentManager.valueToContent(value, contentType.toString())
-                                call.respond(value, typeInfo<Any>())
+                                 when (property) {
+                                     is ExposedStringProperty -> call.respond(property.read(), typeInfo<String>())
+                                     is ExposedIntProperty -> call.respond(property.read(), typeInfo<Int>())
+                                     is ExposedBooleanProperty -> call.respond(property.read(), typeInfo<Boolean>())
+                                     is ExposedNumberProperty -> call.respond(property.read(), typeInfo<Double>())
+                                     is ExposedObjectProperty -> call.respond(property.read(), typeInfo<Map<*,*>>())
+                                     is ExposedNullProperty -> call.respond(property.read(), typeInfo<Any>())
+                                     is ExposedArrayProperty -> call.respond(property.read(), typeInfo<List<*>>())
+                                 }
                             }
                              catch (e: ContentCodecException) {
                                  call.response.status(HttpStatusCode.InternalServerError)
@@ -235,8 +247,16 @@ fun Application.setupRouting(servient: Servient) {
                         if (!property.readOnly) {
                             //val contentType = getOrDefaultRequestContentType(call.request)
                             //val content = Content(contentType.toString(), call.receiveChannel().toByteArray())
-                            //val newValue = property.write(call.receive())
-                            //call.respond(newValue, typeInfo<Any>())
+
+                            when (property) {
+                                is ExposedStringProperty -> call.respond(property.write(call.receive<String>()), typeInfo<String>())
+                                is ExposedIntProperty -> call.respond(property.write(call.receive<Int>()), typeInfo<Int>())
+                                is ExposedBooleanProperty -> call.respond(property.write(call.receive<Boolean>()), typeInfo<Boolean>())
+                                is ExposedNumberProperty -> call.respond(property.write(call.receive<Double>()), typeInfo<Double>())
+                                is ExposedObjectProperty -> call.respond(property.write(call.receive<Map<*,*>>()), typeInfo<Map<*,*>>())
+                                is ExposedNullProperty -> call.respond(property.write(call.receive<Any>()), typeInfo<Any>())
+                                is ExposedArrayProperty -> call.respond(property.write(call.receive<List<*>>()), typeInfo<List<*>>())
+                            }
                         } else {
                             call.response.status(HttpStatusCode.BadRequest)
                         }
@@ -256,7 +276,7 @@ fun Application.setupRouting(servient: Servient) {
 
                     if(action.input != null){
                         val input = ContentManager.contentToValue(content, action.input!!)
-                        val newValue = action.invokeAction(null, null)
+                        val newValue = action.invokeAction(input, null)
                         call.respond(newValue, typeInfo<Any>())
                     }else{
                         val newValue = action.invokeAction(null, null)
diff --git a/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt b/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt
@@ -40,16 +40,14 @@ class HttpProtocolServerTest {
     private val servient: Servient = mockk()
     private val mockServer: EmbeddedServer<*, *> = mockk()
     private val exposedThing: ExposedThing = exposedThing("test") {
-            intProperty(PROPERTY_NAME, PropertyState(initialValue = 0, readHandler = { 2 })){
+            intProperty(PROPERTY_NAME, PropertyState(initialValue = 0, readHandler = { 2 }, writeHandler = { input -> input })){
                 title = "title"
-                readOnly = true
             }
-            action<String, String>(ACTION_NAME, state = ActionState(handler = ActionHandler { input, _ ->
-                // Your action logic here
-                println("Input: $input")
-                return@ActionHandler input?.let { "Output: $it" }
+            action<String, String>(ACTION_NAME, state = ActionState(handler = { input, _ ->
+                input
             }))
             {
+                title = ACTION_NAME
                 input = stringSchema {
                     title = "Action Input"
                     minLength = 10
@@ -149,11 +147,12 @@ class HttpProtocolServerTest {
         // Perform GET request on "/"
         val response = client.get("/")
 
-        val things : List<ExposedThing> = response.body()
+        assertEquals(HttpStatusCode.OK, response.status)
 
+        val things : List<ExposedThing> = response.body()
         assertEquals(1, things.size)
 
-        assertEquals(HttpStatusCode.OK, response.status)
+
     }
 
     @Test
@@ -204,11 +203,8 @@ class HttpProtocolServerTest {
             contentType(ContentType.Application.Json)
         }
 
-        val propertyValue : String = response.body()
-
-        println(propertyValue)
-
         assertEquals(HttpStatusCode.OK, response.status)
+        assertEquals(2, response.body<Int>())
 
     }
 
@@ -225,10 +221,11 @@ class HttpProtocolServerTest {
         // Perform PUT request on property endpoint
         val response = client.put("/test/properties/$propertyName") {
             contentType(ContentType.Application.Json)
-            setBody("""{ "value": "newValue" }""") // JSON payload to update the property
+            setBody(2) // JSON payload to update the property
         }
 
         assertEquals(HttpStatusCode.OK, response.status)
+        assertEquals(2, response.body<Int>())
 
     }
 
@@ -255,10 +252,12 @@ class HttpProtocolServerTest {
         // Perform POST request on action endpoint
         val response = client.post("/test/actions/action1") {
             contentType(ContentType.Application.Json)
-            setBody("""{ "input": "someValue" }""") // JSON payload for action input
+            setBody(""""input"""") // JSON payload for action input"
         }
 
         assertEquals(HttpStatusCode.OK, response.status)
+
+        assertEquals("input", response.body<String>())
     }
 
     @Test
diff --git a/kotlin-wot-binding-http/src/test/resources/logback.xml b/kotlin-wot-binding-http/src/test/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <logger name="io.netty" level="INFO"/>
+</configuration>
diff --git a/kotlin-wot-integration-tests/build.gradle.kts b/kotlin-wot-integration-tests/build.gradle.kts
@@ -0,0 +1,4 @@
+dependencies {
+    api(project(":kotlin-wot"))
+    api(project(":kotlin-wot-binding-http"))
+}
diff --git a/kotlin-wot-integration-tests/src/test/kotlin/integration/WoTIntegrationTest.kt b/kotlin-wot-integration-tests/src/test/kotlin/integration/WoTIntegrationTest.kt
@@ -0,0 +1,36 @@
+package integration
+
+import kotlinx.coroutines.test.runTest
+import ai.ancf.lmos.wot.Servient
+import ai.ancf.lmos.wot.Wot
+import ai.ancf.lmos.wot.binding.http.HttpProtocolClientFactory
+import ai.ancf.lmos.wot.binding.http.HttpProtocolServer
+import kotlin.test.Test
+
+class WoTIntegrationTest {
+
+
+    @Test
+    fun `Should start http server`() = runTest {
+
+        val servient = Servient(
+            servers = listOf(HttpProtocolServer()),
+            clientFactories = listOf(HttpProtocolClientFactory())
+        )
+        val wot = Wot.create(servient)
+
+        val exposedThing = wot.produce {
+            id = "myid"
+            title = "MyThing"
+        }
+
+        servient.start()
+        servient.addThing(exposedThing)
+        servient.expose("myid")
+
+        //val url = servient.fetchDirectory()
+
+        //val consumedThing = servient.fetch(url)
+
+    }
+}
diff --git a/kotlin-wot-integration-tests/src/test/resources/logback.xml b/kotlin-wot-integration-tests/src/test/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <logger name="io.netty" level="INFO"/>
+</configuration>
diff --git a/kotlin-wot/build.gradle.kts b/kotlin-wot/build.gradle.kts
@@ -1,9 +1,8 @@
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.20")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+    //implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.20")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0")
     implementation("org.slf4j:slf4j-api:2.0.16")
-
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
 
     testImplementation("net.javacrumbs.json-unit:json-unit-assertj:3.4.1")
diff --git a/kotlin-wot/src/main/kotlin/Servient.kt b/kotlin-wot/src/main/kotlin/Servient.kt
@@ -23,22 +23,14 @@ import java.util.concurrent.CompletionException
 
 /**
  * The Servient hosts, exposes and consumes things based on provided protocol bindings.
- * https://w3c.github.io/wot-architecture/#sec-servient-implementation<br></br> It reads the servers
- * contained in the configuration parameter "wot.servient.servers", starts them and thus exposes
- * Things via the protocols supported by the servers. "wot.servient.servers" should contain an array
- * of strings of fully qualified class names implementing [ProtocolServer].<br></br> It also reads
- * the clients contained in the configuration parameter "wot.servient.client-factories" and is then
- * able to consume Things via the protocols supported by the clients.
- * "wot.servient.client-factories" should contain an array of strings of fully qualified class names
- * implementing [ProtocolClientFactory].<br></br> The optional configuration parameter
- * "wot.servient.credentials" can contain credentials (e.g. username and password) for the different
- * things.  The parameter should contain a map that uses the thing ids as key.
+ * https://w3c.github.io/wot-architecture/#sec-servient-implementation
  */
 class Servient(
     private val servers: List<ProtocolServer> = emptyList(),
-    private val clientFactories: Map<String, ProtocolClientFactory> = emptyMap(),
+    clientFactories: List<ProtocolClientFactory> = emptyList(),
     val things: MutableMap<String, ExposedThing> = mutableMapOf()
 ) {
+    private val clientFactories: Map<String, ProtocolClientFactory> = clientFactories.associateBy { it.scheme }
 
     override fun toString(): String {
         return "Servient [servers=" + servers + " clientFactories=" + clientFactories.values + "]"
@@ -161,7 +153,6 @@ class Servient(
      * @param url
      * @return
      */
-    @Throws(URISyntaxException::class)
     suspend fun fetch(url: String): ExposedThing {
         return fetch(URI(url))
     }
diff --git a/kotlin-wot/src/main/kotlin/Wot.kt b/kotlin-wot/src/main/kotlin/Wot.kt
@@ -59,6 +59,13 @@ interface Wot {
      */
     suspend fun fetch(url: String): ExposedThing
 
+    companion object {
+        // Factory method to create an instance of WoT with a given Servient
+        fun create(servient: Servient): Wot {
+            return DefaultWot(servient)
+        }
+    }
+
 }
 
 
diff --git a/kotlin-wot/src/main/kotlin/content/ContentManager.kt b/kotlin-wot/src/main/kotlin/content/ContentManager.kt
@@ -152,7 +152,6 @@ object ContentManager {
      * @return
      * @throws ContentCodecException
      */
-    @Throws(ContentCodecException::class)
     fun valueToContent(value: Any?): Content {
         return valueToContent(value, null)
     }
diff --git a/kotlin-wot/src/main/kotlin/thing/action/ExposedThingAction.kt b/kotlin-wot/src/main/kotlin/thing/action/ExposedThingAction.kt
@@ -30,9 +30,9 @@ data class ExposedThingAction<I, O>(
      * @return
      */
     suspend fun invokeAction(
-        input: I?,
+        input: Any?,
         options: Map<String, Map<String, Any>>? = mapOf()
-    ): O? {
+    ): Any? {
         log.debug("'{}' has Action state of '{}': {}", thing.id, title, state)
         return if (state.handler != null) {
             log.debug(
@@ -41,7 +41,7 @@ data class ExposedThingAction<I, O>(
             )
             try {
                 // Use the handler as a suspending function directly
-                state.handler.handle(input, options).also { output ->
+                state.handler.handle(input as I, options).also { output ->
                     if (output == null) {
                         log.warn(
                             "'{}': Called registered handler for Action '{}' returned null. This can cause problems.",
diff --git a/kotlin-wot/src/test/kotlin/ServientTest.kt b/kotlin-wot/src/test/kotlin/ServientTest.kt
@@ -22,7 +22,7 @@ class ServientTest {
     }
     private val servient = Servient(
         servers = listOf(mockServer1, mockServer2),
-        clientFactories = mapOf("http" to factoryMock),
+        clientFactories = listOf(factoryMock),
         things = mutableMapOf("testThing" to mockThing)
     )
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,5 +11,5 @@ plugins {
 
 rootProject.name = "kotlin-wot"
 include("kotlin-wot")
-//include("kotlin-wot-spring-starter")
-include("kotlin-wot-binding-http")
+include("kotlin-wot-binding-http")
+include("kotlin-wot-integration-tests")

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ dependencies {`
`18`	`18`	`implementation("io.ktor:ktor-server-auto-head-response")`
`19`	`19`	`//implementation("io.insert-koin:koin-ktor:4.0.0")`
`20`	`20`	`testImplementation("io.ktor:ktor-server-test-host")`
`21`		`- testImplementation("org.slf4j:slf4j-simple:2.0.16")`
	`21`	`+ testImplementation("ch.qos.logback:logback-classic:1.5.12")`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ open class HttpProtocolClientFactory : ProtocolClientFactory {`
`15`	`15`	`get() = HttpProtocolClient()`
`16`	`16`
`17`	`17`	`override suspend fun init() {`
`18`		`- TODO("Not yet implemented")`
	`18`	`+ // TODO`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override suspend fun destroy() {`
`22`		`- TODO("Not yet implemented")`
	`22`	`+ // TODO`
`23`	`23`	`}`
`24`	`24`	`}`