Added WoT schemas

Author: Robert Winkler

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClient.kt

@@ -108,7 +108,8 @@ class HttpProtocolClient(
         return when (response.status.value) {
             in HttpStatusCode.OK.value..<HttpStatusCode.MultipleChoices.value -> {
                 val body = response.readRawBytes()
-                Content(response.contentType().toString(), body)
+                val contentType = response.contentType() ?: ContentType.Application.Json
+                Content(contentType.toString(), body)
             }
             in HttpStatusCode.MultipleChoices.value..<HttpStatusCode.BadRequest.value -> {
                 throw ProtocolClientException("Received ${response.status.value} and cannot continue (not implemented)")

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt

@@ -4,10 +4,10 @@ import ai.ancf.lmos.wot.Servient
 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.ExposedThingImpl
 import ai.ancf.lmos.wot.thing.form.Form
 import ai.ancf.lmos.wot.thing.form.Operation
-import ai.ancf.lmos.wot.thing.property.ExposedThingProperty.*
+import ai.ancf.lmos.wot.thing.schema.ExposedThing
+import ai.ancf.lmos.wot.thing.schema.InteractionAffordance
 import ai.anfc.lmos.wot.binding.ProtocolServer
 import ai.anfc.lmos.wot.binding.ProtocolServerException
 import com.fasterxml.jackson.databind.DeserializationFeature
@@ -34,7 +34,7 @@ open class HttpProtocolServer(
     private val bindPort: Int = 8080,
     private val createServer: (host: String, port: Int, servient: Servient) -> EmbeddedServer<*, *> = ::defaultServer
 ) : ProtocolServer {
-    val things: MutableMap<String, ExposedThingImpl> = mutableMapOf()
+    val things: MutableMap<String, ExposedThing> = mutableMapOf()
     var started = false
     private var server: EmbeddedServer<*, *>? = null
     private var actualAddresses: List<String> = listOf("http://$bindHost:$bindPort")
@@ -59,7 +59,7 @@ open class HttpProtocolServer(
     }
 
     // Expose a thing
-    override fun expose(thing: ExposedThingImpl) {
+    override fun expose(thing: ExposedThing) {
         if (!started) throw ProtocolServerException("Server has not started yet")
 
         log.info("Exposing thing '{}'", thing.id)
@@ -82,7 +82,7 @@ open class HttpProtocolServer(
         }
     }
 
-    internal fun exposeProperties(thing: ExposedThingImpl, address: String, contentType: String) {
+    internal fun exposeProperties(thing: ExposedThing, address: String, contentType: String) {
         thing.properties.forEach { (name, property) ->
 
             val href = getHrefWithVariablePattern(address, thing, "properties", name, property)
@@ -128,7 +128,7 @@ open class HttpProtocolServer(
         }
     }
 
-    internal fun exposeActions(thing: ExposedThingImpl, address: String, contentType: String) {
+    internal fun exposeActions(thing: ExposedThing, address: String, contentType: String) {
         thing.actions.forEach { (name, action) ->
             val href: String = getHrefWithVariablePattern(address, thing, "actions", name, action)
             // Initialize the form using named parameters
@@ -144,7 +144,7 @@ open class HttpProtocolServer(
         }
     }
 
-    internal fun exposeEvents(thing: ExposedThingImpl, address: String, contentType: String) {
+    internal fun exposeEvents(thing: ExposedThing, address: String, contentType: String) {
         thing.events.forEach { (name, event) ->
             val href = getHrefWithVariablePattern(address, thing, "events", name, event)
 
@@ -164,7 +164,7 @@ open class HttpProtocolServer(
 
     private fun getHrefWithVariablePattern(
         address: String,
-        thing: ExposedThingImpl,
+        thing: ExposedThing,
         type: String,
         interactionName: String,
         interaction: InteractionAffordance
@@ -178,7 +178,7 @@ open class HttpProtocolServer(
     }
 
     // Destroy a thing
-    override suspend fun destroy(thing: ExposedThingImpl) {
+    override suspend fun destroy(thing: ExposedThing) {
         log.info("Removing thing '{}'", thing.id)
         things.remove(thing.id)
     }
@@ -197,15 +197,15 @@ fun Application.setupRouting(servient: Servient) {
     routing {
         route("/") {
             get {
-                call.respond(servient.things.values.toList(), typeInfo<List<ExposedThingImpl>>())
+                call.respond(servient.things.values.toList(), typeInfo<List<ExposedThing>>())
             }
         }
         route("/{id}") {
             get {
                 val id = call.parameters["id"]
-                val thing: ExposedThingImpl? = servient.things[id]
+                val thing: ExposedThing? = servient.things[id]
                 if (thing != null) {
-                    call.respond(thing, typeInfo<ExposedThingImpl>())
+                    call.respond(thing, typeInfo<ExposedThing>())
                 } else {
                     call.response.status(HttpStatusCode.NotFound)
                 }
@@ -224,19 +224,14 @@ fun Application.setupRouting(servient: Servient) {
                     if (property != null) {
                         if (!property.writeOnly) {
                              try {
-                                val value = property.read()
+
+                                 thing.
+
+                                //val value = property.read()
                                 //contentType = getOrDefaultRequestContentType(call.request)
                                 //val content = ContentManager.valueToContent(value, contentType.toString())
-                                 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)
                             } catch (e: ExecutionException) {
@@ -259,15 +254,7 @@ fun Application.setupRouting(servient: Servient) {
                             //val contentType = getOrDefaultRequestContentType(call.request)
                             //val content = Content(contentType.toString(), call.receiveChannel().toByteArray())
 
-                            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)
                         }
@@ -287,11 +274,11 @@ fun Application.setupRouting(servient: Servient) {
 
                     if(action.input != null){
                         val input = ContentManager.contentToValue(content, action.input!!)
-                        val newValue = action.invokeAction(input, null)
-                        call.respond(newValue, typeInfo<Any>())
+                        //val newValue = action.invokeAction(input, null)
+                        //call.respond(newValue, typeInfo<Any>())
                     }else{
-                        val newValue = action.invokeAction(null, null)
-                        call.respond(newValue, typeInfo<Any>())
+                        //val newValue = action.invokeAction(null, null)
+                        //call.respond(newValue, typeInfo<Any>())
                     }
 
 

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientTest.kt

@@ -1,6 +1,10 @@
 package ai.ancf.lmos.wot.binding.http
 import ai.ancf.lmos.wot.security.SecurityScheme
 import ai.ancf.lmos.wot.thing.form.Form
+import io.ktor.client.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
@@ -10,25 +14,30 @@ import kotlin.test.Test
 
 class HttpProtocolClientTest {
 
-    private var form: Form? = null
-    private var statusLine: StatusLine? = null
-    private var securityScheme: SecurityScheme? = null
+    private lateinit var form: Form
+    private lateinit var statusLine: StatusLine
+    private lateinit var securityScheme: SecurityScheme
+    private lateinit var httpClient: HttpClient
+
 
     @BeforeTest
     fun setUp() {
         form = mockk()
         statusLine = mockk()
         securityScheme = mockk()
+        httpClient = mockk()
     }
 
     @Test
     fun `readResource should create proper request`(): Unit = runTest {
-        every { form?.href ?: "" } returns "http://localhost/foo"
-        every { statusLine?.statusCode } returns 200 // HTTP Status OK
+        every { form.href ?: "" } returns "http://localhost/foo"
+        every { statusLine.statusCode } returns 200 // HTTP Status OK
 
-        val client = HttpProtocolClient()
-        client.readResource(form!!)
+        val response : HttpResponse = mockk()
 
+        coEvery { httpClient.request("http://localhost/foo", any()) } returns response
 
+        val client = HttpProtocolClient(httpClient)
+        client.readResource(form)
     }
 }

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt

@@ -2,11 +2,11 @@ package ai.ancf.lmos.wot.binding.http
 
 import ai.ancf.lmos.wot.Servient
 import ai.ancf.lmos.wot.thing.ExposedThingImpl
+import ai.ancf.lmos.wot.thing.Thing
 import ai.ancf.lmos.wot.thing.exposedThing
 import ai.ancf.lmos.wot.thing.form.Operation
 import ai.ancf.lmos.wot.thing.form.Operation.READ_PROPERTY
 import ai.ancf.lmos.wot.thing.form.Operation.WRITE_PROPERTY
-import ai.ancf.lmos.wot.thing.schema.PropertyReadHandler
 import ai.ancf.lmos.wot.thing.schema.StringSchema
 import ai.ancf.lmos.wot.thing.schema.stringSchema
 import ai.anfc.lmos.wot.binding.ProtocolServerException
@@ -40,7 +40,6 @@ class HttpProtocolServerTest {
     private val exposedThing: ExposedThingImpl = exposedThing(servient) {
         intProperty(PROPERTY_NAME) {
             observable = true
-            readHandler = PropertyReadHandler { 2 }
         }
         action<String, String>(ACTION_NAME)
         {
@@ -146,7 +145,7 @@ class HttpProtocolServerTest {
 
         assertEquals(HttpStatusCode.OK, response.status)
 
-        val things : List<ExposedThingImpl> = response.body()
+        val things : List<Thing> = response.body()
         assertEquals(1, things.size)
 
 
@@ -164,7 +163,7 @@ class HttpProtocolServerTest {
         // Perform GET request on "/test"
         val response = client.get("/${exposedThing.id}")
 
-        val thing : ExposedThingImpl = response.body()
+        val thing : Thing = response.body()
 
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(exposedThing.id, thing.id)

kotlin-wot-integration-tests/src/test/kotlin/integration/WoTIntegrationTest.kt

@@ -4,7 +4,9 @@ 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 ai.ancf.lmos.wot.thing.schema.*
+import ai.ancf.lmos.wot.thing.schema.DataSchemaValue
+import ai.ancf.lmos.wot.thing.schema.stringSchema
+import ai.ancf.lmos.wot.thing.schema.toInteractionInputValue
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -31,8 +33,6 @@ class WoTIntegrationTest() {
             stringProperty(PROPERTY_NAME) {
                 description = "Property description"
                 minLength = 10
-                readHandler = PropertyReadHandler { "propertyOutput" }
-                writeHandler = PropertyWriteHandler { input -> input }
             }
             action<String, String>(ACTION){
                 description = "Action description"
@@ -42,13 +42,11 @@ class WoTIntegrationTest() {
                 output = stringSchema {
                     description = "Output description"
                 }
-                actionHandler = ActionHandler { input, options -> "actionOutput: $input" }
             }
         }
 
-        exposedThing.setPropertyReadHandler(PROPERTY_NAME) { "propertyOutput" }
-        exposedThing.setPropertyWriteHandler<String>(PROPERTY_NAME) { input -> input }
-        exposedThing.setActionHandler<String, String>(ACTION) { input, options -> "actionOutput: $input" }
+        //exposedThing.setPropertyWriteHandler(PROPERTY_NAME) { input -> input }
+        //exposedThing.setActionHandler(ACTION) { input, options -> "actionOutput: $input" }
 
         servient.start()
         servient.addThing(exposedThing)
@@ -66,10 +64,14 @@ class WoTIntegrationTest() {
 
         val readProperty = consumedThing.readProperty(PROPERTY_NAME)
 
-        assertEquals("propertyOutput", readProperty.value())
+        val propertyResponse = readProperty.value() as DataSchemaValue.StringValue
 
-        val output = consumedThing.invokeAction(ACTION, "actionInput".toInteractionInputValue())
+        assertEquals("propertyOutput", propertyResponse.value)
 
-        assertEquals("actionOutput + actionInput", output.value())
+        val output = consumedThing.invokeAction(ACTION, "actionInput".toInteractionInputValue(), null)
+
+        val actionResponse = output.value() as DataSchemaValue.StringValue
+
+        assertEquals("actionOutput + actionInput", actionResponse.value)
     }
 }

kotlin-wot/src/main/kotlin/Servient.kt

@@ -7,7 +7,7 @@ import ai.ancf.lmos.wot.thing.Thing
 import ai.ancf.lmos.wot.thing.filter.DiscoveryMethod.*
 import ai.ancf.lmos.wot.thing.filter.ThingFilter
 import ai.ancf.lmos.wot.thing.form.Form
-import ai.ancf.lmos.wot.thing.schema.ArraySchema
+import ai.ancf.lmos.wot.thing.schema.DataSchemaValue
 import ai.ancf.lmos.wot.thing.schema.ExposedThing
 import ai.ancf.lmos.wot.thing.schema.ObjectSchema
 import ai.anfc.lmos.wot.binding.*
@@ -173,8 +173,9 @@ class Servient(
                 val form = Form(href = url.toString())
                 val content = client.readResource(form)
                 try {
-                    val map = ContentManager.contentToValue(content, ObjectSchema())
-                    return Thing.fromMap(map)
+                    val dataSchemaValue = ContentManager.contentToValue(content, ObjectSchema())
+                    dataSchemaValue as DataSchemaValue.ObjectValue
+                    return Thing.fromMap(dataSchemaValue.value)
                 } catch (e: ContentCodecException) {
                     throw ServientException("Error while fetching TD: ${e.message}", e)
                 }
@@ -192,6 +193,8 @@ class Servient(
         return "credentialStore.get(id)"
     }
 
+    /*
+
     /**
      * Calls `url` and expects a Thing Directory there. Returns a list with all found
      * [Thing].
@@ -240,6 +243,8 @@ class Servient(
         }
     }
 
+     */
+
     fun getClientFor(scheme: String): ProtocolClient? {
         val factory = clientFactories[scheme]
         return if (factory != null) {