Skip to content

Commit 22e534b

Browse files
dennisschroederDennis Schröder
andauthored
fix: type adapter for colorname value (#167)
* fix: type adapter for colorname value * fix: type adapter for colorname value * style: removed needles blank line * fix: execute on app ready callback in run testing * style: removes needles blank line Co-authored-by: Dennis Schröder <dennis.schroeder@cbc.de>
1 parent 1c0167d commit 22e534b

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/main/kotlin/khome/Khome.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import khome.values.AppName
5555
import khome.values.Artist
5656
import khome.values.Azimuth
5757
import khome.values.Brightness
58+
import khome.values.ColorName
5859
import khome.values.ColorTemperature
5960
import khome.values.Device
6061
import khome.values.Domain
@@ -300,11 +301,12 @@ internal fun Khome.registerDefaultTypeAdapter() {
300301
registerTypeAdapter<ObjectId, String>(ObjectId)
301302
registerTypeAdapter<Service, String>(Service)
302303
registerTypeAdapter<Device, String>(Device)
303-
registerTypeAdapter<Brightness, String>(Brightness)
304+
registerTypeAdapter<Brightness, Int>(Brightness)
304305
registerTypeAdapter<RGBColor, Array<Int>>(RGBColor)
305306
registerTypeAdapter<HSColor, Array<Double>>(HSColor)
306307
registerTypeAdapter<XYColor, Array<Double>>(XYColor)
307308
registerTypeAdapter<ColorTemperature, Int>(ColorTemperature)
309+
registerTypeAdapter<ColorName, String>(ColorName)
308310
registerTypeAdapter<PowerConsumption, Double>(PowerConsumption)
309311
registerTypeAdapter<Icon, String>(Icon)
310312
registerTypeAdapter<PresetMode, String>(PresetMode)

src/main/kotlin/khome/KhomeApplicationImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ internal class KhomeApplicationImpl : KhomeApplication {
214214
}
215215

216216
override fun runTesting(block: KhomeTestApplication.() -> Unit) {
217+
applicationReadyCallbacks.forEach { it.invoke(this@KhomeApplicationImpl) }
217218
val testApp = KhomeTestApplicationImpl(
218219
sensorsByApiName,
219220
actuatorsByApiName,

src/main/kotlin/khome/values/Brightness.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ data class Brightness private constructor(val value: Int) {
99

1010
companion object : KhomeTypeAdapter<Brightness> {
1111
override fun <P> from(value: P): Brightness {
12-
return Brightness((value as String).toInt())
12+
return Brightness(value as Int)
1313
}
1414

1515
@Suppress("UNCHECKED_CAST")

0 commit comments

Comments
 (0)