Merge pull request #24 from AxonFramework/cleanup-and-version-upgrades

Cleanup and version upgrades

Author: sandjelkovic

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

@@ -32,12 +32,10 @@ import kotlin.test.Test
  *
  * @author Stefan Andjelkovic
  */
-class CommandGatewayExtensionsTest {
+internal class CommandGatewayExtensionsTest {
     private val subjectGateway = mockk<CommandGateway>()
 
     private val exampleCommand = ExampleCommand("1")
-    private val timeoutInterval: Long = 30
-    private val defaultTimeUnit = TimeUnit.MILLISECONDS
 
     @Test
     fun `Send extension should invoke correct method on the gateway`() {

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

@@ -35,7 +35,7 @@ import kotlin.test.assertTrue
  *
  * @author Stefan Andjelkovic
  */
-class QueryGatewayExtensionsTest {
+internal class QueryGatewayExtensionsTest {
 
     private val queryName = ExampleQuery::class.qualifiedName.toString()
     private val exampleQuery = ExampleQuery(2)

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

@@ -32,7 +32,7 @@ import kotlin.test.fail
  *
  * @author Stefan Andjelkovic
  */
-class ResultDiscriminatorCommandCallbackTest {
+internal class ResultDiscriminatorCommandCallbackTest {
     private val command = ExampleCommand("1")
     private val commandMessage: CommandMessage<ExampleCommand> = GenericCommandMessage.asCommandMessage(command)
     private val responsePayloadUUID = UUID.randomUUID().toString()

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

@@ -1,5 +1,7 @@
 package org.axonframework.extensions.kotlin
 
+import org.axonframework.modelling.command.TargetAggregateIdentifier
+
 /**
  * Simple Query class to be used in tests.
  */
@@ -8,4 +10,4 @@ internal data class ExampleQuery(val value: Number)
 /**
  * Simple Command class to be used in tests.
  */
-internal data class ExampleCommand(val id: String)
+internal data class ExampleCommand(@TargetAggregateIdentifier val id: String)

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

@@ -32,9 +32,9 @@
   </modules>
 
   <properties>
-    <axon.version>4.2</axon.version>
+    <axon.version>4.4.1</axon.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <kotlin.version>1.3.50</kotlin.version>
+    <kotlin.version>1.3.61</kotlin.version>
     <kotlin-logging.version>1.7.7</kotlin-logging.version>
     <jackson-kotlin.version>2.10.0</jackson-kotlin.version>
     <mockk.version>1.9.3</mockk.version>