Merge branch 'release/3.7.0'

holunda-io · Dec 14, 2022 · d5861db · d5861db
2 parents 14a5151 + cbb2097
commit d5861db
Show file tree

Hide file tree

Showing 83 changed files with 1,791 additions and 722 deletions.
diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-root</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -81,12 +81,12 @@
 
       <dependency>
         <groupId>io.holunda.polyflow</groupId>
-        <artifactId>polyflow-taskpool-collector</artifactId>
+        <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.holunda.polyflow</groupId>
-        <artifactId>camunda-bpm-engine-client</artifactId>
+        <artifactId>polyflow-camunda-bpm-engine-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -109,6 +109,11 @@
         <artifactId>polyflow-taskpool-sender</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.holunda.polyflow</groupId>
+        <artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.holunda.polyflow</groupId>
         <artifactId>polyflow-form-url-resolver</artifactId>

diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -48,6 +48,11 @@
         <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.holunda.polyflow</groupId>
+        <artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.holunda.polyflow</groupId>
         <artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>

diff --git a/core/bus-jackson/pom.xml b/core/bus-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/datapool/datapool-api/pom.xml b/core/datapool/datapool-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-api</artifactId>

diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>

diff --git a/core/datapool/datapool-event/pom.xml b/core/datapool/datapool-event/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-event</artifactId>

diff --git a/core/datapool/pom.xml b/core/datapool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/taskpool-api/pom.xml b/core/taskpool/taskpool-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-taskpool-api</artifactId>

diff --git a/...l/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/api/task/EngineTaskCommands.kt b/...l/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/api/task/EngineTaskCommands.kt
@@ -346,14 +346,3 @@ data class UpdateAttributesHistoricTaskCommand(
   val priority: Int?,
 
   ) : TaskIdentityWithPayloadAndCorrelations, EngineTaskCommand
-
-/**
- * A batch command to be able to transmit several commands in one unit of work.s
- */
-data class BatchCommand(
-  @TargetAggregateIdentifier
-  override val id: String,
-  val commands: List<EngineTaskCommand> = listOf(),
-  override val order: Int = ORDER_TASK_CANDIDATES_UPDATE,
-  override val eventName: String = BATCH
-) : EngineTaskCommand
diff --git a/core/taskpool/taskpool-core/pom.xml b/core/taskpool/taskpool-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-taskpool-core</artifactId>

diff --git a/...ool-core/src/main/kotlin/io/holunda/polyflow/taskpool/core/task/ExternalCommandHandler.kt b/...ool-core/src/main/kotlin/io/holunda/polyflow/taskpool/core/task/ExternalCommandHandler.kt
@@ -1,15 +1,12 @@
 package io.holunda.polyflow.taskpool.core.task
 
-import io.holunda.camunda.taskpool.api.task.BatchCommand
 import io.holunda.camunda.taskpool.api.task.CreateTaskCommand
 import io.holunda.polyflow.taskpool.core.ifPresentOrElse
 import io.holunda.polyflow.taskpool.core.loadOptional
 import org.axonframework.commandhandling.CommandHandler
 import org.axonframework.commandhandling.GenericCommandMessage
 import org.axonframework.eventsourcing.EventSourcingRepository
 import org.axonframework.messaging.MetaData
-import org.axonframework.messaging.unitofwork.BatchingUnitOfWork
-import org.axonframework.messaging.unitofwork.DefaultUnitOfWork
 import org.springframework.context.annotation.Lazy
 import org.springframework.stereotype.Component
 
@@ -32,29 +29,4 @@ class ExternalCommandHandler(
       missingCallback = { eventSourcingRepository.newInstance { TaskAggregate() }.handle(GenericCommandMessage(command, metadata)) }
     )
   }
-
-  /**
-   * Delivers a batch.
-   * @param batch batch command.
-   */
-  @CommandHandler
-  fun handleBatch(batch: BatchCommand, metadata: MetaData) {
-    eventSourcingRepository.loadOptional(batch.id).ifPresentOrElse(
-      presentConsumer = { aggregate ->
-        aggregate
-          .apply {
-            batch.commands.forEach { command ->
-              val message = GenericCommandMessage(command, metadata)
-              val handling = { handle(message) }
-              val uow = DefaultUnitOfWork.startAndGet(message)
-              uow.executeWithResult(handling)
-            }
-          }
-      },
-      missingCallback = {
-        eventSourcingRepository.newInstance { TaskAggregate() }
-          .apply { batch.commands.forEach { command -> handle(GenericCommandMessage(command, metadata)) } }
-      }
-    )
-  }
 }
diff --git a/...-core/src/test/kotlin/io/holunda/polyflow/taskpool/core/task/TaskHandlerAggregateITest.kt b/...-core/src/test/kotlin/io/holunda/polyflow/taskpool/core/task/TaskHandlerAggregateITest.kt
@@ -8,7 +8,6 @@ import org.assertj.core.api.Assertions.assertThat
 import org.axonframework.commandhandling.gateway.CommandGateway
 import org.axonframework.eventhandling.EventBus
 import org.axonframework.eventhandling.EventMessage
-import org.axonframework.messaging.unitofwork.UnitOfWork
 import org.camunda.bpm.engine.variable.Variables
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
@@ -81,23 +80,6 @@ internal class TaskHandlerAggregateITest {
     assertThat((receivedEvents[1].payload as TaskCreatedEngineEvent).description).isEqualTo("Changed value")
   }
 
-  @Test
-  fun `should accept batch command`() {
-    val addCandidateUsersCommand = AddCandidateUsersCommand(id = createCommand.id, candidateUsers = setOf("kermit"))
-    val addCandidateUsersGroups = AddCandidateGroupsCommand(id = createCommand.id, candidateGroups = setOf("muppets"))
-    commandGateway.sendAndWait<String>(
-      BatchCommand(id = createCommand.id, commands = listOf(
-        createCommand,
-        addCandidateUsersCommand,
-        addCandidateUsersGroups
-      ))
-    )
-    assertThat(receivedEvents.size).isEqualTo(3)
-    assertThat(receivedEvents[0].payload).isInstanceOf(TaskCreatedEngineEvent::class.java)
-    assertThat(receivedEvents[1].payload).isInstanceOf(TaskCandidateUserChanged::class.java)
-    assertThat(receivedEvents[2].payload).isInstanceOf(TaskCandidateGroupChanged::class.java)
-  }
-
   @AfterEach
   fun clean() {
     receivedEvents.clear()

diff --git a/core/taskpool/taskpool-event/pom.xml b/core/taskpool/taskpool-event/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
   </parent>
 
   <artifactId>polyflow-taskpool-event</artifactId>