Merge pull request #61 from efirestone/firestone/no-impl-cast

Add Sensor method to HomeAssistantApiClient protocol
efirestone · Jun 26, 2023 · 4fa69c5 · 4fa69c5
2 parents bacf6c8 + 61c4cd2
commit 4fa69c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/commonMain/kotlin/com/codellyrandom/hassle/HomeAssistantApiClient.kt b/src/commonMain/kotlin/com/codellyrandom/hassle/HomeAssistantApiClient.kt
@@ -1,8 +1,12 @@
 package com.codellyrandom.hassle
 
+import com.codellyrandom.hassle.entities.Attributes
+import com.codellyrandom.hassle.entities.State
+import com.codellyrandom.hassle.entities.devices.Sensor
 import com.codellyrandom.hassle.errorHandling.ErrorResponseData
 import com.codellyrandom.hassle.events.EventHandlerFunction
 import com.codellyrandom.hassle.observability.Switchable
+import com.codellyrandom.hassle.values.EntityId
 import com.codellyrandom.hassle.values.EventType
 import kotlin.reflect.KClass
 
@@ -57,4 +61,11 @@ interface HomeAssistantApiClient {
      * @param errorResponseHandler the handler to be attached.
      */
     fun setErrorResponseHandler(errorResponseHandler: (ErrorResponseData) -> Unit)
+
+    // A non-reified interface that external callers can use to create their own custom sensor implementations.
+    fun <S : State<*>, A : Attributes> Sensor(
+        id: EntityId,
+        stateType: KClass<S>,
+        attributesType: KClass<A>
+    ): Sensor<S, A>
 }
diff --git a/src/commonMain/kotlin/com/codellyrandom/hassle/HomeAssistantApiClientImpl.kt b/src/commonMain/kotlin/com/codellyrandom/hassle/HomeAssistantApiClientImpl.kt
@@ -115,7 +115,7 @@ internal class HomeAssistantApiClientImpl(
      *
      * @return [Sensor]
      */
-    fun <S : State<*>, A : Attributes> Sensor(
+    override fun <S : State<*>, A : Attributes> Sensor(
         id: EntityId,
         stateType: KClass<S>,
         attributesType: KClass<A>
@@ -143,7 +143,7 @@ internal class HomeAssistantApiClientImpl(
         attributesType: KClass<A>,
         serviceCommandResolver: ServiceCommandResolver<S>
     ): Actuator<S, A> =
-        Actuator<S, A>(
+        Actuator(
             id,
             this,
             mapper,

diff --git a/src/commonMain/kotlin/com/codellyrandom/hassle/extending/entities/BaseFactories.kt b/src/commonMain/kotlin/com/codellyrandom/hassle/extending/entities/BaseFactories.kt
@@ -8,22 +8,13 @@ import com.codellyrandom.hassle.entities.State
 import com.codellyrandom.hassle.entities.devices.Actuator
 import com.codellyrandom.hassle.entities.devices.Sensor
 import com.codellyrandom.hassle.values.EntityId
-import kotlin.reflect.KClass
 
 /**
  * Base factories
  */
 
 internal inline fun <reified S : State<*>, reified A : Attributes> HomeAssistantApiClient.Sensor(id: EntityId): Sensor<S, A> =
-    (this as HomeAssistantApiClientImpl).Sensor(id, S::class, A::class)
-
-// A non-reified interface that external callers can use to create their own custom sensor implementations.
-fun <S : State<*>, A : Attributes> HomeAssistantApiClient.Sensor(
-    id: EntityId,
-    stateType: KClass<S>,
-    attributesType: KClass<A>
-): Sensor<S, A> =
-    (this as HomeAssistantApiClientImpl).Sensor(id, stateType, attributesType)
+    Sensor(id, S::class, A::class)
 
 internal inline fun <reified S : State<*>, reified A : Attributes> HomeAssistantApiClient.Actuator(
     id: EntityId,