Rename CombiningCommandCallback to more appropriate name

Author: sandjelkovic

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

@@ -33,7 +33,7 @@ fun <C : Any, 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 = { _, _, _ -> }
-): Unit = this.send(command, CombiningCommandCallback<C, R>(onError, onSuccess))
+): Unit = this.send(command, ResultDiscriminatorCommandCallback<C, R>(onSuccess, onError))
 
 /**
  * Reified version of [CommandGateway.sendAndWait]

kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/CombiningCommandCallback.kt renamed to kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/ResultDiscriminatorCommandCallback.kt

@@ -29,9 +29,9 @@ import org.axonframework.messaging.MetaData
  * @see CommandCallback
  * @author Stefan Andjelkovic
  */
-internal class CombiningCommandCallback<C, R>(
-    val onError: (commandMessage: CommandMessage<out C>, exception: Throwable, metaData: MetaData) -> Unit,
-    val onSuccess: (commandMessage: CommandMessage<out C>, result: R, metaData: MetaData) -> Unit
+internal 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()

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/CombiningCommandCallbackTest.kt renamed to kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/ResultDiscriminatorCommandCallbackTest.kt

@@ -28,11 +28,11 @@ import kotlin.test.Test
 import kotlin.test.fail
 
 /**
- * Tests [CombiningCommandCallback] to verify that it correctly invokes given callbacks.
+ * Tests [ResultDiscriminatorCommandCallback] to verify that it correctly invokes given callbacks.
  *
  * @author Stefan Andjelkovic
  */
-class CombiningCommandCallbackTest {
+class ResultDiscriminatorCommandCallbackTest {
     private val command = ExampleCommand("1")
     private val commandMessage: CommandMessage<ExampleCommand> = GenericCommandMessage.asCommandMessage(command)
     private val responsePayloadUUID = UUID.randomUUID().toString()
@@ -45,7 +45,7 @@ class CombiningCommandCallbackTest {
         val onSuccessMock = mockk<(commandMessage: CommandMessage<out ExampleCommand>, result: String, metaData: MetaData) -> Unit>()
         every { onSuccessMock.invoke(commandMessage, responsePayloadUUID, any()) } returns Unit
 
-        val subject = CombiningCommandCallback<ExampleCommand, String>(
+        val subject = ResultDiscriminatorCommandCallback<ExampleCommand, String>(
             onError = { _, _, _ -> fail("onError should not be called") },
             onSuccess = onSuccessMock
         )
@@ -60,7 +60,7 @@ class CombiningCommandCallbackTest {
         val onSuccessMock = mockk<(commandMessage: CommandMessage<out ExampleCommand>, result: String, metaData: MetaData) -> Unit>()
         every { onSuccessMock.invoke(commandMessage, responsePayloadUUID, any()) } returns Unit
 
-        val subject = CombiningCommandCallback(
+        val subject = ResultDiscriminatorCommandCallback(
             onError = { _, _, _ -> fail("onError should not be called") },
             onSuccess = onSuccessMock
         )
@@ -75,7 +75,7 @@ class CombiningCommandCallbackTest {
         val onError = mockk<(commandMessage: CommandMessage<out ExampleCommand>, exception: Throwable, metaData: MetaData) -> Unit>()
         every { onError.invoke(commandMessage, exceptionalCommandResultMessage.exceptionResult(), any()) } returns Unit
 
-        val subject = CombiningCommandCallback<ExampleCommand, String>(
+        val subject = ResultDiscriminatorCommandCallback<ExampleCommand, String>(
             onError = onError,
             onSuccess = { _, _, _ -> fail("onSuccess should not be called") }
         )
@@ -91,7 +91,7 @@ class CombiningCommandCallbackTest {
         val onError = mockk<(commandMessage: CommandMessage<out ExampleCommand>, exception: Throwable, metaData: MetaData) -> Unit>()
         every { onError.invoke(commandMessage, exceptionalCommandResultMessage.exceptionResult(), any()) } returns Unit
 
-        val subject = CombiningCommandCallback<ExampleCommand, String>(
+        val subject = ResultDiscriminatorCommandCallback<ExampleCommand, String>(
             onError = onError,
             onSuccess = { _, _, _ -> fail("onSuccess should not be called") }
         )