Merge branch 'release/3.10.0'

holunda-io · Apr 21, 2023 · 2cd93da · 2cd93da
2 parents 63457ac + 03829a4
commit 2cd93da
Show file tree

Hide file tree

Showing 37 changed files with 77 additions and 50 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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.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.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+  <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</version>
   </parent>
 
   <artifactId>polyflow-view-jpa</artifactId>

diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryEntity.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryEntity.kt
@@ -16,7 +16,6 @@ class DataEntryEntity(
   @Column(name = "TYPE", nullable = false)
   var type: String,
   @Column(name = "NAME", nullable = false)
-  @Lob
   var name: String,
   @Column(name = "APPLICATION_NAME", nullable = false)
   var applicationName: String,
@@ -26,8 +25,7 @@ class DataEntryEntity(
   var revision: Long = 0L,
   @Embedded
   var state: DataEntryStateEmbeddable,
-  @Column(name = "DESCRIPTION")
-  @Lob
+  @Column(name = "DESCRIPTION", length = 2048)
   var description: String? = null,
 
   @Column(name = "DATE_CREATED", nullable = false)

diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/process/ProcessDefinitionEntity.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/process/ProcessDefinitionEntity.kt
@@ -21,8 +21,7 @@ class ProcessDefinitionEntity(
   var name: String,
   @Column(name = "VERSION_TAG")
   var versionTag: String? = null,
-  @Column(name = "DESCRIPTION")
-  @Lob
+  @Column(name = "DESCRIPTION", length = 2048)
   var description: String? = null,
   @Column(name = "START_FORM_KEY")
   var startFormKey: String? = null,

diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskEntity.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskEntity.kt
@@ -18,7 +18,6 @@ class TaskEntity(
   var taskId: String,
   @Column(name = "TASK_DEF_KEY", nullable = false)
   var taskDefinitionKey: String,
-  @Lob
   @Column(name = "NAME", nullable = false)
   var name: String,
   @Column(name = "PRIORITY")
@@ -52,8 +51,7 @@ class TaskEntity(
   var payloadAttributes: MutableSet<PayloadAttribute> = mutableSetOf(),
   @Column(name = "BUSINESS_KEY")
   var businessKey: String? = null,
-  @Lob
-  @Column(name = "DESCRIPTION")
+  @Column(name = "DESCRIPTION", length = 2048)
   var description: String? = null,
   @Column(name = "FORM_KEY")
   var formKey: String? = null,

diff --git a/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepositoryITest.kt b/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepositoryITest.kt
@@ -49,6 +49,8 @@ internal class DataEntryRepositoryITest {
 
   @BeforeEach
   fun `insert entries`() {
+    dataEntryRepository.deleteAll()
+    entityManager.flush()
 
     val id = UUID.randomUUID().toString()
 

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>3.9.1</version>
+    <version>3.10.0</version>
   </parent>
 
   <artifactId>polyflow-view-mongo</artifactId>

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

diff --git a/view/simple/pom.xml b/view/simple/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-view-parent</artifactId>
-    <version>3.9.1</version>
+    <version>3.10.0</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>3.9.1</version>
+    <version>3.10.0</version>
   </parent>
 
   <artifactId>polyflow-view-api-client</artifactId>

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

diff --git a/view/view-api/src/main/kotlin/filter/Filter.kt b/view/view-api/src/main/kotlin/filter/Filter.kt
@@ -61,7 +61,7 @@ internal fun compareOperator(sign: String): CompareOperator =
       }
     }
 
-    EQUALS-> { filter, actual -> filter.toString() == actual.toString() }
+    EQUALS -> { filter, actual -> filter.toString() == actual.toString() }
 
     else -> throw IllegalArgumentException("Unsupported operator $sign")
   }
@@ -105,7 +105,8 @@ fun filterByPredicate(value: TaskWithDataEntries, wrapper: TaskPredicateWrapper)
     // constraint is defined on task and matches on task property
     || (wrapper.taskAttributePredicate != null && wrapper.taskAttributePredicate.test(value.task) && wrapper.taskPayloadPredicate == null)
     // constraint is defined on data and matches on data entry property
-    || (wrapper.taskAttributePredicate == null && (wrapper.taskPayloadPredicate != null && (value.dataEntries.asSequence().map { dataEntry -> dataEntry.payload }
+    || (wrapper.taskAttributePredicate == null && (wrapper.taskPayloadPredicate != null && (value.dataEntries.asSequence()
+    .map { dataEntry -> dataEntry.payload }
     .find { payload -> wrapper.taskPayloadPredicate.test(payload) } != null || wrapper.taskPayloadPredicate.test(value.task.payload))))
     // both constraints
     || (wrapper.taskAttributePredicate != null && wrapper.taskAttributePredicate.test(value.task) && (wrapper.taskPayloadPredicate != null && (value.dataEntries.asSequence()
@@ -140,7 +141,9 @@ fun filterByPredicate(value: Task, wrapper: TaskPredicateWrapper): Boolean =
     // constraint is defined on data and matches
     || (wrapper.taskAttributePredicate == null && wrapper.taskPayloadPredicate != null && wrapper.taskPayloadPredicate.test(value.payload))
     // both constraints
-    || (wrapper.taskAttributePredicate != null && wrapper.taskAttributePredicate.test(value) && wrapper.taskPayloadPredicate != null && wrapper.taskPayloadPredicate.test(value.payload))
+    || (wrapper.taskAttributePredicate != null && wrapper.taskAttributePredicate.test(value) && wrapper.taskPayloadPredicate != null && wrapper.taskPayloadPredicate.test(
+    value.payload
+  ))
 
 
 /**
@@ -268,18 +271,28 @@ internal fun toCriterion(filter: String): Criterion {
 internal fun isTaskAttribute(propertyName: String): Boolean =
   propertyName.startsWith(TASK_PREFIX)
     && propertyName.length > TASK_PREFIX.length
-    && Task::class.memberProperties.map { it.name }.contains(propertyName.substring(TASK_PREFIX.length))
+    && propertyName.substring(TASK_PREFIX.length).let { taskAttribute ->
+    when {
+      Task::class.memberProperties.map { it.name }.contains(taskAttribute) -> true
+      taskAttribute == "processName" -> true
+      taskAttribute == "textSearch" -> true
+      else -> false
+    }
+  }
 
 /**
  * Checks is a property is a data entry attribute.
  */
 internal fun isDataEntryAttribute(propertyName: String): Boolean =
   propertyName.startsWith(DATA_PREFIX)
     && propertyName.length > DATA_PREFIX.length
-    && (
-    DataEntry::class.memberProperties.map { it.name }.contains(propertyName.substring(DATA_PREFIX.length)) ||
-      DataEntryState::class.memberProperties.map { "${DataEntry::state.name}.${it.name}" }.contains(propertyName.substring(DATA_PREFIX.length))
-    )
+    && propertyName.substring(DATA_PREFIX.length).let { dataEntryAttribute ->
+    when {
+      DataEntry::class.memberProperties.map { it.name }.contains(dataEntryAttribute) -> true
+      DataEntryState::class.memberProperties.map { "${DataEntry::state.name}.${it.name}" }.contains(dataEntryAttribute) -> true
+      else -> false
+    }
+  }
 
 /**
  * Criterion.