fix(queue): argh Kotlin when expressions don't work quite how I thoug…

…ht (#1309)
spinnaker · Apr 28, 2017 · c5dbe10 · c5dbe10
1 parent 84d1e3f
commit c5dbe10
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/MessageHandler.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/MessageHandler.kt
@@ -30,13 +30,11 @@ interface MessageHandler<M : Message> : (Message) -> Unit {
   val repository: ExecutionRepository
 
   override fun invoke(message: Message): Unit =
-    when (message.javaClass) {
-      messageType -> {
-        @Suppress("UNCHECKED_CAST")
-        handle(message as M)
-      }
-      else ->
-        throw IllegalArgumentException("Unsupported message type ${message.javaClass.simpleName}")
+    if (messageType.isAssignableFrom(message.javaClass)) {
+      @Suppress("UNCHECKED_CAST")
+      handle(message as M)
+    } else {
+      throw IllegalArgumentException("Unsupported message type ${message.javaClass.simpleName}")
     }
 
   fun handle(message: M): Unit

diff --git a/orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/MessageHandlerSpec.kt b/orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/MessageHandlerSpec.kt
@@ -23,6 +23,7 @@ import com.netflix.spinnaker.orca.pipeline.model.Pipeline
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.reset
+import com.nhaarman.mockito_kotlin.verify
 import com.nhaarman.mockito_kotlin.verifyZeroInteractions
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
@@ -34,16 +35,16 @@ class MessageHandlerSpec : Spek({
   val repository: ExecutionRepository = mock()
   val handleCallback: (Message) -> Unit = mock()
 
-  val handler = object : MessageHandler<StartExecution> {
+  val handler = object : MessageHandler<ConfigurationError> {
     override val queue
       get() = queue
 
     override val repository
       get() = repository
 
-    override val messageType = StartExecution::class.java
+    override val messageType = ConfigurationError::class.java
 
-    override fun handle(message: StartExecution) {
+    override fun handle(message: ConfigurationError) {
       handleCallback.invoke(message)
     }
   }
@@ -66,4 +67,18 @@ class MessageHandlerSpec : Spek({
       verifyZeroInteractions(handleCallback)
     }
   }
+
+  describe("when the handler is passed a sub-type of message") {
+    val message = InvalidExecutionId(Pipeline::class.java, "1", "foo")
+
+    afterGroup(::resetMocks)
+
+    action("a message is handled") {
+      handler.invoke(message)
+    }
+
+    it("does not invoke the handler") {
+      verify(handleCallback).invoke(message)
+    }
+  }
 })