Merge branch 'release/2.1.1'

holunda-io · Oct 7, 2020 · 6209647 · 6209647
2 parents 27e89ce + 04f7171
commit 6209647
Show file tree

Hide file tree

Showing 52 changed files with 106 additions and 66 deletions.
diff --git a/datapool/datapool-api/pom.xml b/datapool/datapool-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-api</artifactId>

diff --git a/datapool/datapool-core/pom.xml b/datapool/datapool-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-core</artifactId>

diff --git a/datapool/datapool-event/pom.xml b/datapool/datapool-event/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-event</artifactId>

diff --git a/datapool/pom.xml b/datapool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-root</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-docs</artifactId>

diff --git a/docs/src/orchid/resources/changelog/2.1/2.1.1.ad b/docs/src/orchid/resources/changelog/2.1/2.1.1.ad
@@ -0,0 +1,11 @@
+---
+version: 2.1.1
+---
+
+== Features
+
+* Process instance reporting can be switched off by the property: `task.collector.process-instance`, see #274
+
+== Breaking Changes
+
+* Renamed property of task collector for process definition from `task.collector.process` to `task.collector.process-definition`
diff --git a/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad b/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad
@@ -283,8 +283,8 @@ to console (success is logged in `DEBUG` log level, errors are using `ERROR` log
 In some situations it is required to take care of command outcome. A prominent example is to include a metric for command dispatching errors into monitoring. For doing so,
 it is possible to provide own handlers for success and error command outcome.
 
-For the Task Command Sender (as a part of `Taskpool Collector`) please provide a Spring Bean implementing the `io.holunda.camunda.taskpool.sender.gateway.TaskCommandSuccessHandler`
-and `io.holunda.camunda.taskpool.sender.gateway.TaskCommandErrorHandler` accordingly.
+For the Task Command Sender (as a part of `Taskpool Collector`) please provide a Spring Bean implementing the `CommandSuccessHandler`
+and `CommandErrorHandler` accordingly.
 
 
 [source, kotlin]

diff --git a/engine/camunda-engine-client/pom.xml b/engine/camunda-engine-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-engine-client</artifactId>

diff --git a/engine/datapool-collector/pom.xml b/engine/datapool-collector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-collector</artifactId>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-engine-root</artifactId>

diff --git a/engine/property-taskurl-resolver/pom.xml b/engine/property-taskurl-resolver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>taskpool-property-taskurl-resolver</artifactId>

diff --git a/engine/taskpool-collector/pom.xml b/engine/taskpool-collector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-collector</artifactId>

diff --git a/...kpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt b/...kpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.holunda.camunda.taskpool.enricher.*
 import io.holunda.camunda.taskpool.sender.CommandSender
-import io.holunda.camunda.taskpool.sender.TxAwareAccumulatingCommandSender
+import io.holunda.camunda.taskpool.sender.TxAwareAccumulatingEngineTaskCommandSender
 import io.holunda.camunda.taskpool.sender.accumulator.CommandAccumulator
 import io.holunda.camunda.taskpool.sender.accumulator.ProjectingCommandAccumulator
 import io.holunda.camunda.taskpool.sender.gateway.*
@@ -65,7 +65,7 @@ class TaskCollectorConfiguration(
   @ConditionalOnExpression("'\${camunda.taskpool.collector.sender.type}' != 'custom'")
   fun txCommandSender(commandListGateway: CommandListGateway, accumulator: CommandAccumulator): CommandSender =
     when (properties.sender.type) {
-      TaskSenderType.tx -> TxAwareAccumulatingCommandSender(commandListGateway, accumulator, properties.sender.sendWithinTransaction)
+      TaskSenderType.tx -> TxAwareAccumulatingEngineTaskCommandSender(commandListGateway, accumulator, properties.sender.sendWithinTransaction)
       else -> throw IllegalStateException("Could not initialize sender, used ${properties.sender.type} type.")
     }
 
@@ -97,12 +97,12 @@ class TaskCollectorConfiguration(
    * Default logging handler.
    */
   @Bean
-  fun loggingTaskCommandSuccessHandler(): TaskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(LoggerFactory.getLogger(CommandSender::class.java))
+  fun loggingTaskCommandSuccessHandler(): CommandSuccessHandler = LoggingTaskCommandSuccessHandler(LoggerFactory.getLogger(CommandSender::class.java))
 
   /**
    * Default logging handler.
    */
   @Bean
-  fun loggingTaskCommandErrorHandler(): TaskCommandErrorHandler = LoggingTaskCommandErrorHandler(LoggerFactory.getLogger(CommandSender::class.java))
+  fun loggingTaskCommandErrorHandler(): CommandErrorHandler = LoggingTaskCommandErrorHandler(LoggerFactory.getLogger(CommandSender::class.java))
 }
 
diff --git a/...io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt b/...io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt
@@ -15,7 +15,7 @@ class ProcessDefinitionEnginePlugin(
   private val logger: Logger = LoggerFactory.getLogger(ProcessDefinitionEnginePlugin::class.java)
 
   override fun preInit(springConfiguration: SpringProcessEngineConfiguration) {
-    if (properties.process.enabled) {
+    if (properties.processDefintion.enabled) {
       logger.info("EVENTING-010: Process definition registration plugin registered.")
       springConfiguration.customPostBPMNParseListeners.add(
         RegisterProcessDefinitionParseListener(springConfiguration)

diff --git a/...or/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt b/...or/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt
@@ -1,5 +1,6 @@
 package io.holunda.camunda.taskpool.enricher
 
+import io.holunda.camunda.taskpool.TaskCollectorProperties
 import io.holunda.camunda.taskpool.api.process.instance.ProcessInstanceCommand
 import io.holunda.camunda.taskpool.sender.gateway.CommandListGateway
 import mu.KLogging
@@ -11,7 +12,8 @@ import org.springframework.stereotype.Component
  */
 @Component
 class ProcessInstanceEnricherService(
-  private val commandListGateway: CommandListGateway
+  private val commandListGateway: CommandListGateway,
+  private val properties: TaskCollectorProperties
 ) {
   companion object : KLogging()
 
@@ -21,6 +23,11 @@ class ProcessInstanceEnricherService(
    */
   @EventListener
   fun handle(command: ProcessInstanceCommand) {
-    commandListGateway.sendToGateway(listOf(command))
+    if (properties.processInstance.enabled) {
+      commandListGateway.sendToGateway(listOf(command))
+      logger.debug { "Sending update about process instance ${command.processInstanceId}." }
+    } else {
+      logger.debug { "Process instance collecting has been disabled by property, skipping ${command.processInstanceId}." }
+    }
   }
 }
diff --git a/...ender/TxAwareAccumulatingCommandSender.kt → ...areAccumulatingEngineTaskCommandSender.kt b/...ender/TxAwareAccumulatingCommandSender.kt → ...areAccumulatingEngineTaskCommandSender.kt
@@ -11,7 +11,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 /**
  * Collects commands of one transaction, accumulates them to one command and sends it after TX commit.
  */
-open class TxAwareAccumulatingCommandSender(
+open class TxAwareAccumulatingEngineTaskCommandSender(
   private val commandListGateway: CommandListGateway,
   private val commandAccumulator: CommandAccumulator,
   private val sendTasksWithinTransaction: Boolean

diff --git a/...ctor/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt b/...ctor/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt
@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component
 class AxonCommandListGateway(
   private val commandGateway: CommandGateway,
   private val properties: TaskCollectorProperties,
-  private val taskCommandSuccessHandler: TaskCommandSuccessHandler,
-  private val taskCommandErrorHandler: TaskCommandErrorHandler
+  private val commandSuccessHandler: CommandSuccessHandler,
+  private val commandErrorHandler: CommandErrorHandler
 ) : CommandListGateway {
 
   private val logger: Logger = LoggerFactory.getLogger(CommandSender::class.java)
@@ -33,9 +33,9 @@ class AxonCommandListGateway(
       if (properties.sender.enabled) {
         commandGateway.send<Any, Any?>(nextCommand) { commandMessage, commandResultMessage ->
           if (commandResultMessage.isExceptional) {
-            taskCommandErrorHandler.apply(commandMessage, commandResultMessage)
+            commandErrorHandler.apply(commandMessage, commandResultMessage)
           } else {
-            taskCommandSuccessHandler.apply(commandMessage, commandResultMessage)
+            commandSuccessHandler.apply(commandMessage, commandResultMessage)
           }
           sendToGateway(remainingCommands)
         }
@@ -51,7 +51,7 @@ class AxonCommandListGateway(
 /**
  * Error handler, logging the error.
  */
-open class LoggingTaskCommandErrorHandler(private val logger: Logger) : TaskCommandErrorHandler {
+open class LoggingTaskCommandErrorHandler(private val logger: Logger) : CommandErrorHandler {
 
   override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage<out Any?>) {
     logger.error("SENDER-006: Sending command $commandMessage resulted in error", commandResultMessage.exceptionResult())
@@ -61,7 +61,7 @@ open class LoggingTaskCommandErrorHandler(private val logger: Logger) : TaskComm
 /**
  * Logs success.
  */
-open class LoggingTaskCommandSuccessHandler(private val logger: Logger) : TaskCommandSuccessHandler {
+open class LoggingTaskCommandSuccessHandler(private val logger: Logger) : CommandSuccessHandler {
 
   override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage<out Any?>) {
     if (logger.isDebugEnabled) {

diff --git a/...ollector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt b/...ollector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt
@@ -18,9 +18,9 @@ interface CommandListGateway {
 /**
  * Handler for command errors.
  */
-interface TaskCommandErrorHandler : BiFunction<Any, CommandResultMessage<out Any?>, Unit>
+interface CommandErrorHandler : BiFunction<Any, CommandResultMessage<out Any?>, Unit>
 
 /**
  * Handler for command results.
  */
-interface TaskCommandSuccessHandler : BiFunction<Any, CommandResultMessage<out Any?>, Unit>
+interface CommandSuccessHandler : BiFunction<Any, CommandResultMessage<out Any?>, Unit>
diff --git a/...ollector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt b/...ollector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt
@@ -44,8 +44,8 @@ class AxonCommandListGatewayTest {
           enabled = false
         )
       ),
-      taskCommandErrorHandler = LoggingTaskCommandErrorHandler(logger),
-      taskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
+      commandErrorHandler = LoggingTaskCommandErrorHandler(logger),
+      commandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
     )
 
     wrapper.sendToGateway(listOf(makeCreateTaskCommand()))
@@ -63,8 +63,8 @@ class AxonCommandListGatewayTest {
           enabled = true
         )
       ),
-      taskCommandErrorHandler = LoggingTaskCommandErrorHandler(logger),
-      taskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
+      commandErrorHandler = LoggingTaskCommandErrorHandler(logger),
+      commandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
     )
 
     val createTaskCommand = makeCreateTaskCommand()

diff --git a/engine/taskpool-engine-springboot-starter/pom.xml b/engine/taskpool-engine-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-engine-springboot-starter</artifactId>

diff --git a/engine/variable-serializer/pom.xml b/engine/variable-serializer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-variable-serializer</artifactId>

diff --git a/examples/components/process-backend/pom.xml b/examples/components/process-backend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/...kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt b/...kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt
@@ -11,7 +11,7 @@ import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProces
 import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProcess.Variables.ORIGINATOR
 import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProcess.Variables.REQUEST_ID
 import io.holunda.camunda.taskpool.sender.gateway.LoggingTaskCommandErrorHandler
-import io.holunda.camunda.taskpool.sender.gateway.TaskCommandErrorHandler
+import io.holunda.camunda.taskpool.sender.gateway.CommandErrorHandler
 import mu.KLogging
 import org.axonframework.commandhandling.CommandResultMessage
 import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication
@@ -92,7 +92,7 @@ class RequestApprovalProcessConfiguration {
 
   @Bean
   @Primary
-  fun myTaskCommandErrorHandler(): TaskCommandErrorHandler = object : LoggingTaskCommandErrorHandler(logger) {
+  fun myTaskCommandErrorHandler(): CommandErrorHandler = object : LoggingTaskCommandErrorHandler(logger) {
     override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage<out Any?>) {
       logger.error { "<--------- CUSTOM ERROR HANDLER REPORT --------->" }
       super.apply(commandMessage, commandResultMessage)

diff --git a/examples/components/process-forms/pom.xml b/examples/components/process-forms/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-angular/pom.xml b/examples/components/tasklist-angular/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-api/pom.xml b/examples/components/tasklist-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-backend/pom.xml b/examples/components/tasklist-backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-reactive-backend/pom.xml b/examples/components/tasklist-reactive-backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/users/pom.xml b/examples/components/users/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>taskpool-examples-root</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml b/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>example-distributed-axon-server-webapp-application</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-cockpit-root</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
   </parent>
 
   <artifactId>taskpool-example-cockpit</artifactId>