Merge pull request #4 from AxonFramework/master

Merge master

Author: zambrovski

.github/dependabot.yml

@@ -5,3 +5,11 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  # Specify labels for pull requests
+  labels:
+    - "Type: Dependency Upgrade"
+    - "Priority 1: Must"
+  # Add reviewers
+  reviewers:
+    - "sandjelkovic"
+    - "smcvb"

.github/workflows/maven.yml

@@ -1,6 +1,6 @@
 name: Kotlin Extension Build and Tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010-2020. Axon Framework
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.axonframework.extensions.kotlin
+
+import org.axonframework.messaging.MetaData
+import org.axonframework.modelling.command.Aggregate
+import org.axonframework.modelling.command.AggregateLifecycle
+import org.axonframework.modelling.command.ApplyMore
+
+/**
+ * Alias for [AggregateLifecycle.apply] method.
+ * @param payload payload of the event message to be applied.
+ * @return fluent instance to apply more.
+ */
+fun applyEvent(payload: Any): ApplyMore = AggregateLifecycle.apply(payload)
+
+/**
+ * Alias for [AggregateLifecycle.apply] method.
+ * @param payload payload of the event message to be applied.
+ * @param metaData metadata to be included into the event message.
+ * @return fluent instance to apply more.
+ */
+fun applyEvent(payload: Any, metaData: MetaData): ApplyMore = AggregateLifecycle.apply(payload, metaData)
+
+/**
+ * Create new aggregate instance.
+ * @param [T] aggregate type.
+ * @param factoryMethod factory method.
+ */
+inline fun <reified T : Any> createNew(noinline factoryMethod: () -> T): Aggregate<T> = AggregateLifecycle.createNew(T::class.java, factoryMethod)

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010-2020. Axon Framework
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.axonframework.extensions.kotlin
+
+import org.axonframework.eventsourcing.EventSourcingRepository
+import org.axonframework.modelling.command.GenericJpaRepository
+
+/**
+ * Reified version of the static builder for event souring repository.
+ * @param [T] aggregate type.
+ * @return event sourcing repository builder for aggregate [T]
+ */
+inline fun <reified T : Any> eventSourcingRepositoryBuilder() = EventSourcingRepository.builder(T::class.java)
+
+
+/**
+ * Reified version of the static builder for JPA repository.
+ * @param [T] aggregate type.
+ * @return Generic JPA repository builder for aggregate [T]
+ */
+inline fun <reified T : Any> genericJpaRepositoryBuilder() = GenericJpaRepository.builder(T::class.java)

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>>()) }

pom.xml

@@ -35,8 +35,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <kotlin.version>1.4.10</kotlin.version>
     <kotlin-logging.version>1.12.0</kotlin-logging.version>
-    <jackson-kotlin.version>2.11.2</jackson-kotlin.version>
-    <mockk.version>1.10.0</mockk.version>
+    <jackson-kotlin.version>2.11.3</jackson-kotlin.version>
+    <mockk.version>1.10.2</mockk.version>
     <junit.jupiter.version>5.7.0</junit.jupiter.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.13.3</log4j.version>