Merge branch 'release/4.1.2'

bom/datapool-dependencies/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

bom/parent/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-root</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,14 +21,14 @@
     <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.2</axon-bom.version>
+    <axon-bom.version>4.9.3</axon-bom.version>
     <axon-kotlin.version>4.9.0</axon-kotlin.version>
     <axon-gateway-extension.version>2.0.0</axon-gateway-extension.version>
 
     <awaitility.version>4.2.0</awaitility.version>
     <mockito-kotlin.version>5.2.1</mockito-kotlin.version>
     <jgiven.version>1.3.1</jgiven.version>
-    <jgiven-kotlin.version>1.3.0.0</jgiven-kotlin.version>
+    <jgiven-kotlin.version>1.3.1.0</jgiven-kotlin.version>
 
     <pattern.class.itest>**/*ITest.*</pattern.class.itest>
     <pattern.package.itest>**/itest/**/*.*</pattern.package.itest>

bom/taskpool-dependencies/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

core/bus-jackson/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

core/datapool/datapool-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-datapool-api</artifactId>

core/datapool/datapool-core/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>

core/datapool/datapool-event/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-datapool-event</artifactId>

core/datapool/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

core/spring-utils/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

core/taskpool/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

core/taskpool/taskpool-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-api</artifactId>

core/taskpool/taskpool-core/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-core</artifactId>

core/taskpool/taskpool-event/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-event</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-engine-client</artifactId>

integration/camunda-bpm/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-datapool-sender</artifactId>

integration/common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-tasklist-url-resolver</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-taskpool-sender</artifactId>

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.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-variable-serializer</artifactId>

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.polyflow</groupId>
   <artifactId>polyflow-root</artifactId>
-  <version>4.1.1</version>
+  <version>4.1.2</version>
   <packaging>pom</packaging>
 
   <name>POM: ${project.artifactId}</name>

view/form-url-resolver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-form-url-resolver</artifactId>

view/jpa/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-view-jpa</artifactId>
@@ -233,7 +233,7 @@
               <dependency>
                 <groupId>com.microsoft.sqlserver</groupId>
                 <artifactId>mssql-jdbc</artifactId>
-                <version>12.5.0.jre11-preview</version>
+                <version>12.6.0.jre11</version>
               </dependency>
               <dependency>
                 <groupId>org.postgresql</groupId>

view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/CountByApplication.kt

@@ -0,0 +1,15 @@
+package io.holunda.polyflow.view.jpa
+
+/**
+ * Helper multi-valued class to support count by application name queries.
+ */
+data class CountByApplication(
+  /**
+   * application name (grouping criteria).
+   */
+  val applicationName: String,
+  /**
+   * Count.
+   */
+  val count: Long
+)

view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewTaskService.kt

@@ -292,7 +292,9 @@ class JpaPolyflowViewTaskService(
 
   @QueryHandler
   override fun query(query: TaskCountByApplicationQuery): List<ApplicationWithTaskCount> {
-    TODO("Count by application query is not implemented yet")
+    return taskRepository.getCountByApplication().map {
+      ApplicationWithTaskCount(application = it.applicationName, taskCount = it.count.toInt())
+    }
   }
 
   @QueryHandler

view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskRepository.kt

@@ -1,11 +1,13 @@
 package io.holunda.polyflow.view.jpa.task
 
+import io.holunda.polyflow.view.jpa.CountByApplication
 import io.holunda.polyflow.view.jpa.auth.AuthorizationPrincipal
 import io.holunda.polyflow.view.jpa.composeOr
 import io.holunda.polyflow.view.jpa.payload.PayloadAttribute
 import io.holunda.polyflow.view.jpa.process.SourceReferenceEmbeddable
 import org.springframework.data.jpa.domain.Specification
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
+import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.CrudRepository
 import java.time.Instant
 
@@ -268,4 +270,14 @@ interface TaskRepository : CrudRepository<TaskEntity, String>, JpaSpecificationE
         builder.and(pathEquals, valueAnyOf)
       }
   }
+
+
+  /**
+   * Counts user tasks grouped by application name, resulting in a total amount of tasks per application (=process engine).
+   * Helpful for monitoring of tasks on the task pool projection side vs. engine side.
+   * @return list of count by application groupings.
+   */
+  @Query("select new io.holunda.polyflow.view.jpa.CountByApplication(t.sourceReference.applicationName, count(t) ) from TaskEntity t group by t.sourceReference.applicationName")
+  fun getCountByApplication(): List<CountByApplication>
+
 }

view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceTaskITest.kt

@@ -514,6 +514,16 @@ internal class JpaPolyflowViewServiceTaskITest {
 
   }
 
+  @Test
+  fun `should count tasks`() {
+
+    val counts = jpaPolyflowViewService.query(TaskCountByApplicationQuery())
+    assertThat(counts).isNotNull
+    assertThat(counts).hasSize(1)
+    assertThat(counts[0].application).isEqualTo("test-application")
+    assertThat(counts[0].taskCount).isEqualTo(3)
+  }
+
   private fun captureEmittedQueryUpdates(): List<QueryUpdate<Any>> {
     val queryTypeCaptor = argumentCaptor<Class<Any>>()
     val predicateCaptor = argumentCaptor<Predicate<Any>>()

view/mongo/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-view-mongo</artifactId>

view/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <relativePath>../bom/parent/pom.xml</relativePath>
   </parent>
 

view/simple/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-view-simple</artifactId>

view/view-api-client/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-view-api-client</artifactId>

view/view-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
   </parent>
 
   <artifactId>polyflow-view-api</artifactId>