Merge branch 'release/3.8.2'

holunda-io · Mar 24, 2023 · dcfbd1e · dcfbd1e
2 parents 82bab59 + 60f92b7
commit dcfbd1e
Show file tree

Hide file tree

Showing 39 changed files with 114 additions and 53 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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -28,11 +28,11 @@
 
     <awaitability.version>4.2.0</awaitability.version>
     <mockito-kotlin.version>4.1.0</mockito-kotlin.version>
-    <jgiven.version>1.2.4</jgiven.version>
+    <jgiven.version>1.2.5</jgiven.version>
 
     <pattern.class.itest>**/*ITest.*</pattern.class.itest>
     <pattern.package.itest>**/itest/**/*.*</pattern.package.itest>
-    <jgiven-kotlin.version>1.2.4.0</jgiven-kotlin.version>
+    <jgiven-kotlin.version>1.2.5.0</jgiven-kotlin.version>
   </properties>
 
   <modules>
@@ -363,7 +363,7 @@
           <!-- java compiler -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>3.11.0</version>
           <configuration>
             <encoding>UTF-8</encoding>
             <source>${java.version}</source>
@@ -401,7 +401,7 @@
           <!-- resources -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -552,7 +552,7 @@
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0</version>
           <configuration>
             <useSystemClassLoader>false</useSystemClassLoader>
             <runOrder>random</runOrder>
@@ -573,7 +573,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0</version>
           <executions>
             <execution>
               <goals>
@@ -597,7 +597,7 @@
         <plugin>
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.7.20</version>
+          <version>1.8.10</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>

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.8.1</version>
+    <version>3.8.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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.8.1</version>
+    <version>3.8.2</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
@@ -212,7 +212,10 @@ data class UpdateAttributeTaskCommand(
    * Optional task priority.
    */
   val priority: Int?,
-
+  /**
+   * True if no properties of the task have actually changed.
+   */
+  val unchanged: Boolean = false
 ) : TaskIdentityWithPayloadAndCorrelations, 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.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-core</artifactId>

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.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-event</artifactId>

diff --git a/integration/camunda-bpm/engine-client/pom.xml b/integration/camunda-bpm/engine-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-engine-client</artifactId>

diff --git a/integration/camunda-bpm/pom.xml b/integration/camunda-bpm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/integration/camunda-bpm/springboot-autoconfigure/pom.xml b/integration/camunda-bpm/springboot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>

diff --git a/integration/camunda-bpm/springboot-starter/pom.xml b/integration/camunda-bpm/springboot-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>

diff --git a/integration/camunda-bpm/taskpool-collector/pom.xml b/integration/camunda-bpm/taskpool-collector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>

diff --git a/...taskpool-collector/src/main/kotlin/io/holunda/polyflow/taskpool/DelegateTaskExtensions.kt b/...taskpool-collector/src/main/kotlin/io/holunda/polyflow/taskpool/DelegateTaskExtensions.kt
@@ -100,7 +100,8 @@ fun DelegateTask.toUpdateCommand(applicationName: String) = UpdateAttributeTaskC
   priority = this.priority,
   taskDefinitionKey = this.taskDefinitionKey,
   businessKey = this.execution.businessKey,
-  sourceReference = this.sourceReference(applicationName)
+  sourceReference = this.sourceReference(applicationName),
+  unchanged = this is TaskEntity && this.propertyChanges.isEmpty()
 )
 
 

diff --git a/.../src/main/kotlin/io/holunda/polyflow/taskpool/collector/task/TaskEventCollectorService.kt b/.../src/main/kotlin/io/holunda/polyflow/taskpool/collector/task/TaskEventCollectorService.kt
@@ -107,8 +107,8 @@ class TaskEventCollectorService(
   @EventListener(condition = "#task.eventName.equals('update')")
   fun update(task: DelegateTask): UpdateAttributeTaskCommand? =
     if (task is TaskEntity) {
-      if (task.isAssigneeChange() || !task.hasChangedProperties()) {
-        // this is already handled by assignment event, or it is an empty fired during taskService call of candidate update.
+      if (task.isAssigneeChange()) {
+        // this is already handled by assignment event
         null
       } else {
         task.toUpdateCommand(camundaTaskpoolCollectorProperties.applicationName)

diff --git a/...a-bpm/taskpool-collector/src/test/kotlin/io/holunda/polyflow/taskpool/itest/TestDriver.kt b/...a-bpm/taskpool-collector/src/test/kotlin/io/holunda/polyflow/taskpool/itest/TestDriver.kt
@@ -114,7 +114,8 @@ class TestDriver(
     fun updateTaskCommand(
       variables: VariableMap = DEFAULT_VARIABLES,
       instanceBusinessKey: String = BUSINESS_KEY,
-      correlations: VariableMap = newCorrelations()
+      correlations: VariableMap = newCorrelations(),
+      unchanged: Boolean = false
     ) =
       BpmnAwareTests.task(BpmnAwareTests.taskQuery().initializeFormKeys()).let { task ->
         UpdateAttributeTaskCommand(
@@ -137,7 +138,8 @@ class TestDriver(
           enriched = true,
           businessKey = instanceBusinessKey,
           payload = variables,
-          correlations = correlations
+          correlations = correlations,
+          unchanged = unchanged
         )
       }
 
@@ -173,4 +175,4 @@ class TestDriver(
       BpmnAwareTests.assertThat(instance).isNotNull
       BpmnAwareTests.assertThat(instance).isStarted
     }
-}
+}
diff --git a/...ool-collector/src/test/kotlin/io/holunda/polyflow/taskpool/itest/tx/TaskCollectorITest.kt b/...ool-collector/src/test/kotlin/io/holunda/polyflow/taskpool/itest/tx/TaskCollectorITest.kt
@@ -366,6 +366,39 @@ internal class TaskCollectorITest {
     verifyNoMoreInteractions(commandListGateway)
   }
 
+  @Test
+  fun `updates attributes via API with update listener when task is unchanged`() {
+
+    // deploy
+    driver.deployProcess(
+      createUserTaskProcess(
+        taskListeners = listOf(
+          "update" to "#{changeTaskAttributes}"
+        )
+      )
+    )
+
+    // start
+    val instance = driver.startProcessInstance()
+    driver.assertProcessInstanceWaitsInUserTask(instance)
+    verify(commandListGateway).sendToGateway(listOf(createTaskCommand()))
+
+    // trigger the update event on the task
+    runtimeService.setVariable(instance.processInstanceId, "bla", "blubb")
+    taskService.saveTask(task())
+
+    val updateCommand = updateTaskCommand(
+      variables = Variables.createVariables().apply {
+        putAll(DEFAULT_VARIABLES)
+        putValue("bla", "blubb")
+      },
+      unchanged = true
+    )
+    verify(commandListGateway).sendToGateway(listOf(updateCommand))
+
+    verifyNoMoreInteractions(commandListGateway)
+  }
+
   /**
    * The process is started and wait in a user task.
    * The update command is send after the TX commit.

diff --git a/integration/camunda-bpm/taskpool-job-sender/pom.xml b/integration/camunda-bpm/taskpool-job-sender/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>

diff --git a/integration/common/datapool-sender/pom.xml b/integration/common/datapool-sender/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-datapool-sender</artifactId>

diff --git a/integration/common/pom.xml b/integration/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/integration/common/tasklist-url-resolver/pom.xml b/integration/common/tasklist-url-resolver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-tasklist-url-resolver</artifactId>

diff --git a/integration/common/taskpool-sender/pom.xml b/integration/common/taskpool-sender/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-sender</artifactId>

diff --git a/...olunda/polyflow/taskpool/sender/task/accumulator/SimpleEngineTaskCommandIntentDetector.kt b/...olunda/polyflow/taskpool/sender/task/accumulator/SimpleEngineTaskCommandIntentDetector.kt
@@ -6,7 +6,6 @@ import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.ATTRI
 import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.CANDIDATE_USER_ADD
 import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.CANDIDATE_USER_DELETE
 import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.COMPLETE
-import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.CREATE
 import io.holunda.camunda.taskpool.api.task.CamundaTaskEventType.Companion.DELETE
 
 /**
@@ -63,6 +62,7 @@ class SimpleEngineTaskCommandIntentDetector(
         }
         // updates of the listener are accepted
         is UpdateAttributeTaskCommand -> engineTaskCommands.filter { it.eventName == ATTRIBUTES_LISTENER_UPDATE }
+        is UpdateAssignmentTaskCommand -> engineTaskCommands.filter { it is UpdateAttributeTaskCommand && it.unchanged}
         else -> listOf()
       }
 }
diff --git a/integration/common/variable-serializer/pom.xml b/integration/common/variable-serializer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <artifactId>polyflow-variable-serializer</artifactId>