Merge branch 'release/4.1.4'

holunda-io · Mar 4, 2024 · 4f20ca6 · 4f20ca6
2 parents e7e8226 + ec5d83b
commit 4f20ca6
Show file tree

Hide file tree

Showing 34 changed files with 57 additions and 43 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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <springboot.version>3.1.5</springboot.version>
     <camunda-commons-typed-values.version>7.20.0</camunda-commons-typed-values.version>
 
-    <axon-bom.version>4.9.3</axon-bom.version>
+    <axon-bom.version>4.9.4</axon-bom.version>
     <axon-kotlin.version>4.9.0</axon-kotlin.version>
     <axon-gateway-extension.version>2.0.0</axon-gateway-extension.version>
 

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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

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

diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-datapool-event</artifactId>

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

diff --git a/core/spring-utils/pom.xml b/core/spring-utils/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-taskpool-api</artifactId>

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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</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
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-engine-client</artifactId>

diff --git a/integration/camunda-bpm/pom.xml b/integration/camunda-bpm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>

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>4.1.3</version>
+    <version>4.1.4</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
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-datapool-sender</artifactId>

diff --git a/integration/common/pom.xml b/integration/common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</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>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-taskpool-sender</artifactId>

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>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-variable-serializer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.polyflow</groupId>
   <artifactId>polyflow-root</artifactId>
-  <version>4.1.3</version>
+  <version>4.1.4</version>
   <packaging>pom</packaging>
 
   <name>POM: ${project.artifactId}</name>

diff --git a/view/form-url-resolver/pom.xml b/view/form-url-resolver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-form-url-resolver</artifactId>

diff --git a/view/jpa/pom.xml b/view/jpa/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-view-jpa</artifactId>

diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewTaskService.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewTaskService.kt
@@ -180,7 +180,9 @@ class JpaPolyflowViewTaskService(
       )
     }
 
-    val page = taskRepository.findAll(specification.and(userQuery), pageRequest).map { taskEntity -> taskEntity.toTask(objectMapper) }
+    val page = taskRepository
+      .findAll(specification.and(userQuery), pageRequest)
+      .map { taskEntity -> taskEntity.toTask(objectMapper) }
 
     return TaskQueryResult(
       elements = page.toList(),
@@ -202,7 +204,9 @@ class JpaPolyflowViewTaskService(
     }.mapTaskSort()
     val pageRequest = pageRequest(query.page, query.size, sort)
 
-    val page = taskRepository.findAll(taskSpecification.and(authorizationSpecification), pageRequest).map { taskEntity -> taskEntity.toTask(objectMapper) }
+    val page = taskRepository
+      .findAll(taskSpecification.and(authorizationSpecification), pageRequest)
+      .map { taskEntity -> taskEntity.toTask(objectMapper) }
 
     return TaskQueryResult(
       elements = page.toList(),
@@ -229,7 +233,9 @@ class JpaPolyflowViewTaskService(
     }.mapTaskSort()
     val pageRequest = pageRequest(query.page, query.size, sort)
 
-    val page = taskRepository.findAll(taskSpecification.and(authorizationSpecification), pageRequest).map { taskEntity -> taskEntity.toTask(objectMapper) }
+    val page = taskRepository
+      .findAll(taskSpecification.and(authorizationSpecification), pageRequest)
+      .map { taskEntity -> taskEntity.toTask(objectMapper) }
 
     return TaskQueryResult(
       elements = page.toList(),
@@ -307,7 +313,7 @@ class JpaPolyflowViewTaskService(
         emitTaskUpdate(updated)
 
       }.ifPresent { entity ->
-        logger.debug("Cannot create task '${event.id}' because it already exists in the database")
+        logger.warn { "Will not create task '${event.id}' because it already exists in the database"}
         emitTaskUpdate(entity)
       }
   }
@@ -326,7 +332,7 @@ class JpaPolyflowViewTaskService(
     taskRepository
       .findById(event.id)
       .ifEmpty {
-        logger.warn("Cannot update task '${event.id}' because it does not exist in the database")
+        logger.warn { "Cannot update task '${event.id}' because it does not exist in the database" }
       }.ifPresent { entity ->
         entity.assignee = event.assignee
         val updated = taskRepository.save(entity)
@@ -347,7 +353,9 @@ class JpaPolyflowViewTaskService(
 
     taskRepository
       .findById(event.id)
-      .ifEmpty { "Cannot complete task '${event.id}' because it does not exist in the database" }
+      .ifEmpty {
+        logger.warn { "Cannot complete task '${event.id}' because it does not exist in the database" }
+      }
       .ifPresent { entity ->
         taskRepository.delete(entity)
         emitTaskUpdate(entity, deleted = true)
@@ -367,7 +375,9 @@ class JpaPolyflowViewTaskService(
 
     taskRepository
       .findById(event.id)
-      .ifEmpty { "Cannot delete task '${event.id}' because it does not exist in the database" }
+      .ifEmpty {
+        logger.warn { "Cannot delete task '${event.id}' because it does not exist in the database" }
+      }
       .ifPresent { entity ->
         taskRepository.delete(entity)
         emitTaskUpdate(entity, deleted = true)
@@ -387,7 +397,9 @@ class JpaPolyflowViewTaskService(
 
     taskRepository
       .findById(event.id)
-      .ifEmpty { "Cannot update task '${event.id}' because it does not exist in the database" }
+      .ifEmpty {
+        logger.warn { "Cannot update task '${event.id}' because it does not exist in the database" }
+      }
       .ifPresent { entity ->
 
         val updated = taskRepository.save(
@@ -416,7 +428,7 @@ class JpaPolyflowViewTaskService(
     taskRepository
       .findById(event.id)
       .ifEmpty {
-        logger.warn("Cannot update task '${event.id}' because it does not exist in the database")
+        logger.warn { "Cannot update task '${event.id}' because it does not exist in the database"}
       }.ifPresent { entity ->
         when (event.assignmentUpdateType) {
           CamundaTaskEventType.CANDIDATE_GROUP_ADD -> entity.authorizedPrincipals.add(group(event.groupId).toString())
@@ -441,7 +453,7 @@ class JpaPolyflowViewTaskService(
     taskRepository
       .findById(event.id)
       .ifEmpty {
-        logger.warn("Cannot update task '${event.id}' because it does not exist in the database")
+        logger.warn { "Cannot update task '${event.id}' because it does not exist in the database" }
       }
       .ifPresent { entity ->
 

diff --git a/view/mongo/pom.xml b/view/mongo/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-view-mongo</artifactId>

diff --git a/view/mongo/src/test/kotlin/io/holunda/polyflow/view/mongo/service/TaskChangeTrackerTest.kt b/view/mongo/src/test/kotlin/io/holunda/polyflow/view/mongo/service/TaskChangeTrackerTest.kt
@@ -263,6 +263,8 @@ internal class TaskChangeTrackerTest {
   private fun publisher() = TestPublisher.create<ChangeStreamEvent<TaskDocument>>()
 
   private fun TestPublisher<ChangeStreamEvent<TaskDocument>>.returnForResumeToken(resumeToken: Int?) = apply {
+
+    //whenever(taskRepository.getTaskUpdates(anyOrNull())).thenReturn(this.flux())
     whenever(taskRepository.getTaskUpdates(resumeToken?.let { resumeToken(it) })).thenReturn(this.flux())
   }
 

diff --git a/view/pom.xml b/view/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
     <relativePath>../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/view/simple/pom.xml b/view/simple/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-view-simple</artifactId>

diff --git a/view/view-api-client/pom.xml b/view/view-api-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
   </parent>
 
   <artifactId>polyflow-view-api-client</artifactId>