Merge pull request #36 from holixon/feature/command_gateway_reified_types

reified both types on command gateway send

Author: sandjelkovic

kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/CommandGatewayExtensions.kt

@@ -29,8 +29,8 @@ import org.axonframework.messaging.MetaData
  * @param [C] the type of payload of the command
  * @see CommandGateway.send
  */
-fun <C : Any, R : Any?> CommandGateway.send(
+inline fun <reified C : Any, reified R : Any?> CommandGateway.send(
     command: C,
-    onSuccess: (commandMessage: CommandMessage<out C>, result: R, metaData: MetaData) -> Unit = { _, _, _ -> },
-    onError: (commandMessage: CommandMessage<out C>, exception: Throwable, metaData: MetaData) -> Unit = { _, _, _ -> }
+    noinline onSuccess: (commandMessage: CommandMessage<out C>, result: R, metaData: MetaData) -> Unit = { _, _, _ -> },
+    noinline onError: (commandMessage: CommandMessage<out C>, exception: Throwable, metaData: MetaData) -> Unit = { _, _, _ -> }
 ): Unit = this.send(command, ResultDiscriminatorCommandCallback<C, R>(onSuccess, onError))

kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/ResultDiscriminatorCommandCallback.kt

@@ -21,20 +21,20 @@ import org.axonframework.commandhandling.CommandResultMessage
 import org.axonframework.messaging.MetaData
 
 /**
- * Implementation of the [CommandCallback] that is appropriate for dedicated [onError] and [onSuccess] callbacks
+ * Implementation of the [CommandCallback] that is appropriate for dedicated [onError] and [onSuccess] callbacks.
  * @param onError Callback to handle failed execution. Defaults to an empty function
  * @param onSuccess Callback to handle successful execution. Defaults to an empty function
  * @param [R] the type of result of the command handling
  * @param [C] the type of payload of the command
  * @see CommandCallback
  * @author Stefan Andjelkovic
  */
-internal class ResultDiscriminatorCommandCallback<C, R>(
+class ResultDiscriminatorCommandCallback<C, R>(
     val onSuccess: (commandMessage: CommandMessage<out C>, result: R, metaData: MetaData) -> Unit,
     val onError: (commandMessage: CommandMessage<out C>, exception: Throwable, metaData: MetaData) -> Unit
 ) : CommandCallback<C, R> {
     override fun onResult(commandMessage: CommandMessage<out C>, commandResultMessage: CommandResultMessage<out R>) {
-        val metaData = commandResultMessage.metaData ?: MetaData.emptyInstance()
+        val metaData: MetaData = commandResultMessage.metaData ?: MetaData.emptyInstance()
         if (commandResultMessage.isExceptional) {
             onError(commandMessage, commandResultMessage.exceptionResult(), metaData)
         } else {

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/CommandGatewayExtensionsTest.kt

@@ -15,16 +15,10 @@
  */
 package org.axonframework.extensions.kotlin
 
-import io.mockk.Runs
-import io.mockk.every
-import io.mockk.just
-import io.mockk.mockk
-import io.mockk.verify
+import io.mockk.*
 import org.axonframework.commandhandling.CommandCallback
-import org.axonframework.commandhandling.CommandMessage
 import org.axonframework.commandhandling.gateway.CommandGateway
 import org.axonframework.messaging.MetaData
-import java.util.concurrent.TimeUnit
 import kotlin.test.Test
 
 /**
@@ -41,7 +35,11 @@ internal class CommandGatewayExtensionsTest {
     fun `Send extension should invoke correct method on the gateway`() {
         every { subjectGateway.send(exampleCommand, any<CommandCallback<ExampleCommand, Any>>()) } just Runs
 
-        subjectGateway.send<ExampleCommand, Any>(command = exampleCommand, onError = { _, _, _ -> }, onSuccess = { _, _, _ -> })
+        subjectGateway.send(
+            command = exampleCommand,
+            onError = { _, _, _ -> },
+            onSuccess = { _, _: Any, _ -> }
+        )
 
         verify { subjectGateway.send(exampleCommand, any<CommandCallback<ExampleCommand, Any>>()) }
     }
@@ -52,8 +50,8 @@ internal class CommandGatewayExtensionsTest {
 
         subjectGateway.send(
             command = exampleCommand,
-            onError = { _: Any, _: Throwable, _: MetaData -> },
-            onSuccess = { _: CommandMessage<out ExampleCommand>, _: Any, _: MetaData -> }
+            onError = { _, _: Throwable, _: MetaData -> },
+            onSuccess = { _, _: Any, _: MetaData -> }
         )
 
         verify { subjectGateway.send(exampleCommand, any<CommandCallback<ExampleCommand, Any>>()) }