Fixed compile issues

Author: Robert Winkler

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

@@ -93,9 +93,11 @@ fun Application.setupRouting(servient: Servient) {
                 }
             }
             route("/properties/{name}") {
+                /*
                 get("/observable") {
                     call.respond("Observing property", typeInfo<String>())
                 }
+                */
                 get {
                     val id = call.parameters["id"] ?: return@get call.response.status(HttpStatusCode.BadRequest)
                     val propertyName = call.parameters["name"]
@@ -116,6 +118,7 @@ fun Application.setupRouting(servient: Servient) {
                         if (!property.readOnly) {
                             val newValue = call.receive<Any>()
                             // TODO handle write logic
+
                             call.response.status(HttpStatusCode.OK)
                         } else {
                             call.response.status(HttpStatusCode.BadRequest)

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

@@ -10,7 +10,6 @@ import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
-import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.jackson.*
 import io.ktor.server.engine.*
@@ -26,8 +25,8 @@ class HttpProtocolServerTest {
     private val mockServer: EmbeddedServer<*, *> = mockk()
     private val exposedThing: ExposedThing = ExposedThing(
         thing("test") {
-            property("property1"){
-                type = "integer"
+            intProperty("property1"){
+                title = "title"
             }
             action("action1"){
 
@@ -121,10 +120,10 @@ class HttpProtocolServerTest {
         // Perform GET request on "/"
         val response = client.get("/")
 
-        println(response.bodyAsText())
-
         val things : List<ExposedThing> = response.body()
 
+        assertEquals(1, things.size)
+
         assertEquals(HttpStatusCode.OK, response.status)
         assertContains(things, exposedThing)
     }
@@ -141,8 +140,6 @@ class HttpProtocolServerTest {
         // Perform GET request on "/test"
         val response = client.get("/${exposedThing.id}")
 
-        println(response.bodyAsText())
-
         val thing : ExposedThing = response.body()
 
         assertEquals(HttpStatusCode.OK, response.status)
@@ -181,6 +178,7 @@ class HttpProtocolServerTest {
         }
 
         assertEquals(HttpStatusCode.OK, response.status)
+
     }
 
     private fun ApplicationTestBuilder.httpClient(): HttpClient {

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

@@ -198,7 +198,7 @@ class Servient(
         }
     }
 
-    fun getCredentials(id: String?): Any {
+    fun getCredentials(id: String?): String {
         log.debug("Servient looking up credentials for '{}'", id)
         return "credentialStore.get(id)"
     }

kotlin-wot/src/main/kotlin/binding/ProtocolClient.kt

@@ -45,7 +45,7 @@ interface ProtocolClient {
      * @param credentials
      * @return
      */
-    fun setSecurity(metadata: List<SecurityScheme>, credentials: Any): Boolean {
+    fun setSecurity(metadata: List<SecurityScheme>, credentials: Map<String, String>): Boolean {
         return false
     }
 

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

@@ -77,7 +77,7 @@ class ConsumedThing(private val servient: Servient, private val thing: Thing) :
                         log.debug("'{}' setting credentials for '{}'", id, client)
 
                         val metadata = security.mapNotNull { key -> securityDefinitions[key] }
-                        client.setSecurity(metadata, servient.getCredentials(id))
+                        client.setSecurity(metadata, mapOf( "credentials" to servient.getCredentials(id)))
                     }
                     return scheme to client
                 }

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

@@ -238,23 +238,14 @@ data class Thing (
     @JsonInclude(NON_EMPTY) override var uriVariables: MutableMap<String, DataSchema<@Contextual Any>>? = null
 ) : ThingDescription {
 
-
-
-
-    /*
-    fun Thing.property(name: String, configure: ThingProperty<Any>.() -> Unit) {
-        this.properties[name] = ThingProperty<Any>().apply(configure)
-    }
-     */
-
     fun Thing.stringProperty(name: String, configure: StringProperty.() -> Unit) {
-        this.properties[name] = StringProperty().apply(configure) as ThingProperty<Any>
+        this.properties[name] = StringProperty().apply(configure)
     }
     fun Thing.intProperty(name: String, configure: IntProperty.() -> Unit) {
-        this.properties[name] = IntProperty().apply(configure) as ThingProperty<Any>
+        this.properties[name] = IntProperty().apply(configure)
     }
     fun Thing.booleanProperty(name: String, configure: BooleanProperty.() -> Unit) {
-        this.properties[name] = BooleanProperty().apply(configure) as ThingProperty<Any>
+        this.properties[name] = BooleanProperty().apply(configure)
     }
 
     fun Thing.action(name: String, configure: ThingAction<Any, Any>.() -> Unit) {

kotlin-wot/src/main/kotlin/thing/event/ExposedThingEvent.kt

@@ -19,7 +19,7 @@ import kotlinx.serialization.Transient
 import org.slf4j.LoggerFactory
 
 @Serializable
-data class ExposedThingEvent<T, S, C>(private val event: ThingEvent<T, S, C> = ThingEvent()) : EventAffordance<T, S, C> by event {
+data class ExposedThingEvent<T, S, C>(private val event: EventAffordance<T, S, C> = ThingEvent()) : EventAffordance<T, S, C> by event {
 
     @Transient @JsonIgnore private val state : EventState<T> = EventState()