From 08b88566cae214353fec742dd2bceebbfd084159 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Fri, 21 Jul 2023 11:00:17 +0200 Subject: [PATCH 1/4] Update for next development version --- bom/datapool-dependencies/pom.xml | 2 +- bom/parent/pom.xml | 2 +- bom/taskpool-dependencies/pom.xml | 2 +- core/bus-jackson/pom.xml | 2 +- core/datapool/datapool-api/pom.xml | 2 +- core/datapool/datapool-core/pom.xml | 2 +- core/datapool/datapool-event/pom.xml | 2 +- core/datapool/pom.xml | 2 +- core/taskpool/pom.xml | 2 +- core/taskpool/taskpool-api/pom.xml | 2 +- core/taskpool/taskpool-core/pom.xml | 2 +- core/taskpool/taskpool-event/pom.xml | 2 +- integration/camunda-bpm/engine-client/pom.xml | 2 +- integration/camunda-bpm/pom.xml | 2 +- integration/camunda-bpm/springboot-autoconfigure/pom.xml | 2 +- integration/camunda-bpm/springboot-starter/pom.xml | 2 +- integration/camunda-bpm/taskpool-collector/pom.xml | 2 +- integration/camunda-bpm/taskpool-job-sender/pom.xml | 2 +- integration/common/datapool-sender/pom.xml | 2 +- integration/common/pom.xml | 2 +- integration/common/tasklist-url-resolver/pom.xml | 2 +- integration/common/taskpool-sender/pom.xml | 2 +- integration/common/variable-serializer/pom.xml | 2 +- pom.xml | 2 +- view/form-url-resolver/pom.xml | 2 +- view/jpa/pom.xml | 2 +- view/mongo/pom.xml | 2 +- view/pom.xml | 2 +- view/simple/pom.xml | 2 +- view/view-api-client/pom.xml | 2 +- view/view-api/pom.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml index 84078a681..202ca4975 100644 --- a/bom/datapool-dependencies/pom.xml +++ b/bom/datapool-dependencies/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../parent/pom.xml diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index ec52a2da9..3db0a714d 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-root - 3.14.2 + 3.14.3-SNAPSHOT ../../pom.xml diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml index 3552f1c3d..cbacb46f9 100644 --- a/bom/taskpool-dependencies/pom.xml +++ b/bom/taskpool-dependencies/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../parent/pom.xml diff --git a/core/bus-jackson/pom.xml b/core/bus-jackson/pom.xml index 838b6d474..b1df3e00e 100755 --- a/core/bus-jackson/pom.xml +++ b/core/bus-jackson/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../../bom/parent/pom.xml diff --git a/core/datapool/datapool-api/pom.xml b/core/datapool/datapool-api/pom.xml index 595a7df82..e5adeaadc 100755 --- a/core/datapool/datapool-api/pom.xml +++ b/core/datapool/datapool-api/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-datapool-api diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml index 55e4f1dad..121682c79 100644 --- a/core/datapool/datapool-core/pom.xml +++ b/core/datapool/datapool-core/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-datapool-core diff --git a/core/datapool/datapool-event/pom.xml b/core/datapool/datapool-event/pom.xml index 689625f91..6bf03cbbf 100755 --- a/core/datapool/datapool-event/pom.xml +++ b/core/datapool/datapool-event/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-datapool-event diff --git a/core/datapool/pom.xml b/core/datapool/pom.xml index b1961055b..70eb6602c 100755 --- a/core/datapool/pom.xml +++ b/core/datapool/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../../bom/parent/pom.xml diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml index 39d615524..193c529a6 100755 --- a/core/taskpool/pom.xml +++ b/core/taskpool/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../../bom/parent/pom.xml diff --git a/core/taskpool/taskpool-api/pom.xml b/core/taskpool/taskpool-api/pom.xml index 88a2d5d02..053ee47d7 100755 --- a/core/taskpool/taskpool-api/pom.xml +++ b/core/taskpool/taskpool-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-taskpool-api diff --git a/core/taskpool/taskpool-core/pom.xml b/core/taskpool/taskpool-core/pom.xml index 550567bd8..99d6c532c 100755 --- a/core/taskpool/taskpool-core/pom.xml +++ b/core/taskpool/taskpool-core/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-taskpool-core diff --git a/core/taskpool/taskpool-event/pom.xml b/core/taskpool/taskpool-event/pom.xml index 96a956771..340ff1111 100644 --- a/core/taskpool/taskpool-event/pom.xml +++ b/core/taskpool/taskpool-event/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-taskpool-event diff --git a/integration/camunda-bpm/engine-client/pom.xml b/integration/camunda-bpm/engine-client/pom.xml index 8eaf7c376..f12d13ef3 100644 --- a/integration/camunda-bpm/engine-client/pom.xml +++ b/integration/camunda-bpm/engine-client/pom.xml @@ -4,7 +4,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-camunda-bpm-engine-client diff --git a/integration/camunda-bpm/pom.xml b/integration/camunda-bpm/pom.xml index 99c2290b2..6eb1b8fa2 100644 --- a/integration/camunda-bpm/pom.xml +++ b/integration/camunda-bpm/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../../bom/parent/pom.xml diff --git a/integration/camunda-bpm/springboot-autoconfigure/pom.xml b/integration/camunda-bpm/springboot-autoconfigure/pom.xml index b116939e9..9acdd4f64 100755 --- a/integration/camunda-bpm/springboot-autoconfigure/pom.xml +++ b/integration/camunda-bpm/springboot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-camunda-bpm-springboot-autoconfigure diff --git a/integration/camunda-bpm/springboot-starter/pom.xml b/integration/camunda-bpm/springboot-starter/pom.xml index 2dbc12f2a..6c2b9158b 100755 --- a/integration/camunda-bpm/springboot-starter/pom.xml +++ b/integration/camunda-bpm/springboot-starter/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-camunda-bpm-springboot-starter diff --git a/integration/camunda-bpm/taskpool-collector/pom.xml b/integration/camunda-bpm/taskpool-collector/pom.xml index 1d8074164..dd7252f6f 100755 --- a/integration/camunda-bpm/taskpool-collector/pom.xml +++ b/integration/camunda-bpm/taskpool-collector/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-camunda-bpm-taskpool-collector diff --git a/integration/camunda-bpm/taskpool-job-sender/pom.xml b/integration/camunda-bpm/taskpool-job-sender/pom.xml index a0ae673a0..497af6a49 100755 --- a/integration/camunda-bpm/taskpool-job-sender/pom.xml +++ b/integration/camunda-bpm/taskpool-job-sender/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-camunda-bpm-taskpool-job-sender diff --git a/integration/common/datapool-sender/pom.xml b/integration/common/datapool-sender/pom.xml index 4e861edc9..c1dce3f33 100755 --- a/integration/common/datapool-sender/pom.xml +++ b/integration/common/datapool-sender/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-datapool-sender diff --git a/integration/common/pom.xml b/integration/common/pom.xml index 5e4ff12d6..481477720 100755 --- a/integration/common/pom.xml +++ b/integration/common/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../../bom/parent/pom.xml diff --git a/integration/common/tasklist-url-resolver/pom.xml b/integration/common/tasklist-url-resolver/pom.xml index 982ce67d2..97d86dbe0 100644 --- a/integration/common/tasklist-url-resolver/pom.xml +++ b/integration/common/tasklist-url-resolver/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-tasklist-url-resolver diff --git a/integration/common/taskpool-sender/pom.xml b/integration/common/taskpool-sender/pom.xml index 52e086c56..cc06b813e 100755 --- a/integration/common/taskpool-sender/pom.xml +++ b/integration/common/taskpool-sender/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-taskpool-sender diff --git a/integration/common/variable-serializer/pom.xml b/integration/common/variable-serializer/pom.xml index 286473f89..22532cfab 100755 --- a/integration/common/variable-serializer/pom.xml +++ b/integration/common/variable-serializer/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-variable-serializer diff --git a/pom.xml b/pom.xml index 24df767df..cb80f654f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-root - 3.14.2 + 3.14.3-SNAPSHOT pom POM: ${project.artifactId} diff --git a/view/form-url-resolver/pom.xml b/view/form-url-resolver/pom.xml index 3a7ed3256..5c0bcd43a 100644 --- a/view/form-url-resolver/pom.xml +++ b/view/form-url-resolver/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-form-url-resolver diff --git a/view/jpa/pom.xml b/view/jpa/pom.xml index c1734b1ab..006cb7556 100644 --- a/view/jpa/pom.xml +++ b/view/jpa/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-view-jpa diff --git a/view/mongo/pom.xml b/view/mongo/pom.xml index b600bb944..99c6696c1 100755 --- a/view/mongo/pom.xml +++ b/view/mongo/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-view-mongo diff --git a/view/pom.xml b/view/pom.xml index bb0223468..4a10e4c94 100644 --- a/view/pom.xml +++ b/view/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.2 + 3.14.3-SNAPSHOT ../bom/parent/pom.xml diff --git a/view/simple/pom.xml b/view/simple/pom.xml index 0c8347708..c9e994698 100755 --- a/view/simple/pom.xml +++ b/view/simple/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-view-simple diff --git a/view/view-api-client/pom.xml b/view/view-api-client/pom.xml index 17bfd1cc2..9b01124dc 100755 --- a/view/view-api-client/pom.xml +++ b/view/view-api-client/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-view-api-client diff --git a/view/view-api/pom.xml b/view/view-api/pom.xml index d7bec819a..4625a40b1 100755 --- a/view/view-api/pom.xml +++ b/view/view-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.2 + 3.14.3-SNAPSHOT polyflow-view-api From 72166dd3a6f2b32a209e6515103982af9cd5f31d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 10:57:39 +0200 Subject: [PATCH 2/4] chore(deps): bump springboot.version from 2.7.13 to 2.7.14 (#846) Bumps `springboot.version` from 2.7.13 to 2.7.14. Updates `org.springframework.boot:spring-boot-dependencies` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.13...v2.7.14) Updates `org.springframework.boot:spring-boot-starter-test` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.13...v2.7.14) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 3db0a714d..313d1bf54 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -18,7 +18,7 @@ https://github.com/holunda-io/camunda-bpm-taskpool/ - 2.7.13 + 2.7.14 7.18.0 4.6.6 From 6f5aac18aba9dadc6e64672ab06dba78f6e78d4d Mon Sep 17 00:00:00 2001 From: S-Tim Date: Tue, 25 Jul 2023 11:01:13 +0200 Subject: [PATCH 3/4] fix(#845): Selected distinct results in queries (#848) * fix(#845): Selected distinct results in queries * fix: order of elements in the result is not guaranteed --- .../view/jpa/data/DataEntryRepository.kt | 3 +- .../polyflow/view/jpa/task/TaskRepository.kt | 4 +- .../JpaPolyflowViewServiceDataEntryITest.kt | 5 +- .../jpa/JpaPolyflowViewServiceTaskITest.kt | 67 +++++++++---------- 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepository.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepository.kt index 1c6380ae2..68f82ce7f 100644 --- a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepository.kt +++ b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/data/DataEntryRepository.kt @@ -87,7 +87,8 @@ interface DataEntryRepository : CrudRepository, Jp * Specification for checking the payload attribute. */ fun hasDataEntryPayloadAttribute(name: String, value: String): Specification = - Specification { dataEntry, _, builder -> + Specification { dataEntry, query, builder -> + query.distinct(true) val join = dataEntry.join>(DataEntryEntity::payloadAttributes.name) val pathEquals = builder.equal( join.get(PayloadAttribute::path.name), diff --git a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskRepository.kt b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskRepository.kt index 8ed1690a8..2e97a302f 100644 --- a/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskRepository.kt +++ b/view/jpa/src/main/kotlin/io/holunda/polyflow/view/jpa/task/TaskRepository.kt @@ -2,7 +2,6 @@ package io.holunda.polyflow.view.jpa.task import io.holunda.polyflow.view.jpa.auth.AuthorizationPrincipal import io.holunda.polyflow.view.jpa.composeOr -import io.holunda.polyflow.view.jpa.data.DataEntryEntity import io.holunda.polyflow.view.jpa.payload.PayloadAttribute import io.holunda.polyflow.view.jpa.process.SourceReferenceEmbeddable import org.springframework.data.jpa.domain.Specification @@ -239,7 +238,8 @@ interface TaskRepository : CrudRepository, JpaSpecificationE * Specification for checking the payload attribute of a task. */ fun hasTaskPayloadAttribute(name: String, value: String): Specification = - Specification { task, _, builder -> + Specification { task, query, builder -> + query.distinct(true) val join = task.join>(TaskEntity::payloadAttributes.name) val pathEquals = builder.equal( join.get(PayloadAttribute::path.name), diff --git a/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceDataEntryITest.kt b/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceDataEntryITest.kt index b5602d78c..5c43829a4 100644 --- a/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceDataEntryITest.kt +++ b/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceDataEntryITest.kt @@ -308,8 +308,9 @@ internal class JpaPolyflowViewServiceDataEntryITest { private fun assertResultIsTestEntry1And2(result: QueryResponseMessage) { assertThat(result.payload.elements.size).isEqualTo(2) - assertTestDataEntry1(result.payload.elements[0]) - assertTestDataEntry2(result.payload.elements[1]) + assertThat(result.payload.elements.map { it.entryId }).containsExactlyInAnyOrder(id, id2) + assertTestDataEntry1(result.payload.elements.first { it.entryId == id }) + assertTestDataEntry2(result.payload.elements.first { it.entryId == id2 }) } diff --git a/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceTaskITest.kt b/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceTaskITest.kt index 605859a12..52f4acaea 100644 --- a/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceTaskITest.kt +++ b/view/jpa/src/test/kotlin/io/holunda/polyflow/view/jpa/JpaPolyflowViewServiceTaskITest.kt @@ -12,6 +12,7 @@ import io.holunda.polyflow.view.TaskWithDataEntries import io.holunda.polyflow.view.auth.User import io.holunda.polyflow.view.jpa.itest.TestApplication import io.holunda.polyflow.view.jpa.process.toSourceReference +import io.holunda.polyflow.view.query.data.DataEntriesForUserQuery import io.holunda.polyflow.view.query.task.* import org.assertj.core.api.Assertions.assertThat import org.axonframework.messaging.MetaData @@ -76,15 +77,6 @@ internal class JpaPolyflowViewServiceTaskITest { @BeforeEach fun `ingest events`() { - val payload = mapOf( - "key" to "value", - "key-int" to 1, - "complex" to Pojo( - attribute1 = "value", - attribute2 = Date.from(now) - ) - ) - jpaPolyflowViewService.on( event = TaskCreatedEngineEvent( id = id, @@ -92,7 +84,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 1", priority = 50, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload()) }, businessKey = "business-1", createTime = Date.from(now), candidateUsers = setOf("kermit"), @@ -107,7 +99,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 1", priority = 25, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload()) }, businessKey = "business-1", createTime = Date.from(now), candidateUsers = setOf("kermit"), @@ -123,7 +115,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 2", priority = 10, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload()) }, businessKey = "business-2", createTime = Date.from(now), candidateUsers = setOf("piggy"), @@ -138,7 +130,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 2", priority = 10, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload()) }, businessKey = "business-2", createTime = Date.from(now), assignee = "piggy", @@ -155,7 +147,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 3", priority = 10, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload()) }, correlations = newCorrelations().apply { put(dataType1, dataId1) }, businessKey = "business-3", createTime = Date.from(now), @@ -172,7 +164,7 @@ internal class JpaPolyflowViewServiceTaskITest { applicationName = "test-application", name = "Test Entry 1", state = ProcessingType.IN_PROGRESS.of("In progress"), - payload = serialize(payload = payload, mapper = objectMapper), + payload = serialize(payload = createPayload("dataEntry1"), mapper = objectMapper), authorizations = listOf( AuthorizationChange.addUser("luffy"), AuthorizationChange.addGroup("strawhats") @@ -195,7 +187,7 @@ internal class JpaPolyflowViewServiceTaskITest { name = "task name 4", priority = 10, sourceReference = processReference().toSourceReference(), - payload = createVariables().apply { putAll(payload) }, + payload = createVariables().apply { putAll(createPayload("otherValue")) }, correlations = newCorrelations().apply { put(dataType1, dataId1) put(dataType2, dataId2) @@ -216,7 +208,7 @@ internal class JpaPolyflowViewServiceTaskITest { applicationName = "test-application", name = "Test Entry 2", state = ProcessingType.IN_PROGRESS.of("In progress"), - payload = serialize(payload = payload, mapper = objectMapper), + payload = serialize(payload = createPayload("dataEntry2"), mapper = objectMapper), authorizations = listOf( AuthorizationChange.addUser("zoro") ), @@ -364,58 +356,53 @@ internal class JpaPolyflowViewServiceTaskITest { } - @Test - fun `should or-compose filters on same attribute when querying tasks`() { - val kermit = jpaPolyflowViewService.query( + fun `should or-compose task payload filters on same attribute`() { + val query = jpaPolyflowViewService.query( TasksForUserQuery( user = User("zoro", setOf("strawhats")), assignedToMeOnly = false, - filters = listOf("task.businessKey=business-3", "task.businessKey=business-4") + filters = listOf("key=value", "key=otherValue", "key=anotherValue") ) ) - assertThat(kermit.elements).hasSize(2) + assertThat(query.elements).hasSize(2) } @Test - fun `should or-compose filters on same attribute when querying data entries`() { - val kermit = jpaPolyflowViewService.query( - TasksWithDataEntriesForUserQuery( + fun `should or-compose data entry payload filters on same attribute`() { + val query = jpaPolyflowViewDataEntryService.query( + DataEntriesForUserQuery( user = User("zoro", setOf("strawhats")), - assignedToMeOnly = false, - filters = listOf("data.entryId=${dataId1}", "data.entryId=${dataId2}") + filters = listOf("key=dataEntry1", "key=dataEntry2", "key=dataEntryFoo") ) ) - assertThat(kermit.elements).hasSize(2) + assertThat(query.payload.elements).hasSize(2) } @Test - fun `should or-compose filters on same attribute when filtering on task payload`() { - // query with mutually exclusive filter criteria should still yield result + fun `should or-compose task attribute filters on same attribute`() { val kermit = jpaPolyflowViewService.query( TasksForUserQuery( user = User("zoro", setOf("strawhats")), assignedToMeOnly = false, - filters = listOf("key=value", "key.not-value") + filters = listOf("task.businessKey=business-3", "task.businessKey=business-4") ) ) assertThat(kermit.elements).hasSize(2) } @Test - fun `should or-compose filters on same attribute when filtering on data entry payload`() { - // query with mutually exclusive filter criteria should still yield result + fun `should or-compose date entry attribute filters on same attribute`() { val kermit = jpaPolyflowViewService.query( TasksWithDataEntriesForUserQuery( user = User("zoro", setOf("strawhats")), assignedToMeOnly = false, - filters = listOf("key=value", "key.not-value") + filters = listOf("data.entryId=${dataId1}", "data.entryId=${dataId2}") ) ) assertThat(kermit.elements).hasSize(2) } - @Test fun `should find the task by group`() { val unassigned = jpaPolyflowViewService.query(TasksForGroupQuery(user = User("other", setOf("muppets")), includeAssigned = false)) @@ -512,4 +499,14 @@ internal class JpaPolyflowViewServiceTaskITest { } + private fun createPayload(value: String = "value"): Map { + return mapOf( + "key" to value, + "key-int" to 1, + "complex" to Pojo( + attribute1 = "value", + attribute2 = Date.from(now) + ) + ) + } } From 63679f27756f23b1911746494301dcae11702a83 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 25 Jul 2023 11:28:24 +0200 Subject: [PATCH 4/4] Update for next development version --- bom/datapool-dependencies/pom.xml | 2 +- bom/parent/pom.xml | 2 +- bom/taskpool-dependencies/pom.xml | 2 +- core/bus-jackson/pom.xml | 2 +- core/datapool/datapool-api/pom.xml | 2 +- core/datapool/datapool-core/pom.xml | 2 +- core/datapool/datapool-event/pom.xml | 2 +- core/datapool/pom.xml | 2 +- core/taskpool/pom.xml | 2 +- core/taskpool/taskpool-api/pom.xml | 2 +- core/taskpool/taskpool-core/pom.xml | 2 +- core/taskpool/taskpool-event/pom.xml | 2 +- integration/camunda-bpm/engine-client/pom.xml | 2 +- integration/camunda-bpm/pom.xml | 2 +- integration/camunda-bpm/springboot-autoconfigure/pom.xml | 2 +- integration/camunda-bpm/springboot-starter/pom.xml | 2 +- integration/camunda-bpm/taskpool-collector/pom.xml | 2 +- integration/camunda-bpm/taskpool-job-sender/pom.xml | 2 +- integration/common/datapool-sender/pom.xml | 2 +- integration/common/pom.xml | 2 +- integration/common/tasklist-url-resolver/pom.xml | 2 +- integration/common/taskpool-sender/pom.xml | 2 +- integration/common/variable-serializer/pom.xml | 2 +- pom.xml | 2 +- view/form-url-resolver/pom.xml | 2 +- view/jpa/pom.xml | 2 +- view/mongo/pom.xml | 2 +- view/pom.xml | 2 +- view/simple/pom.xml | 2 +- view/view-api-client/pom.xml | 2 +- view/view-api/pom.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml index 202ca4975..5bcf1b616 100644 --- a/bom/datapool-dependencies/pom.xml +++ b/bom/datapool-dependencies/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../parent/pom.xml diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 313d1bf54..992d39c38 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-root - 3.14.3-SNAPSHOT + 3.14.3 ../../pom.xml diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml index cbacb46f9..3ab2c3eec 100644 --- a/bom/taskpool-dependencies/pom.xml +++ b/bom/taskpool-dependencies/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../parent/pom.xml diff --git a/core/bus-jackson/pom.xml b/core/bus-jackson/pom.xml index b1df3e00e..ac3b9e2fb 100755 --- a/core/bus-jackson/pom.xml +++ b/core/bus-jackson/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../../bom/parent/pom.xml diff --git a/core/datapool/datapool-api/pom.xml b/core/datapool/datapool-api/pom.xml index e5adeaadc..9d37fe455 100755 --- a/core/datapool/datapool-api/pom.xml +++ b/core/datapool/datapool-api/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-datapool-api diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml index 121682c79..0d6e76ede 100644 --- a/core/datapool/datapool-core/pom.xml +++ b/core/datapool/datapool-core/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-datapool-core diff --git a/core/datapool/datapool-event/pom.xml b/core/datapool/datapool-event/pom.xml index 6bf03cbbf..f04bf6f2d 100755 --- a/core/datapool/datapool-event/pom.xml +++ b/core/datapool/datapool-event/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-datapool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-datapool-event diff --git a/core/datapool/pom.xml b/core/datapool/pom.xml index 70eb6602c..f418cbc22 100755 --- a/core/datapool/pom.xml +++ b/core/datapool/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../../bom/parent/pom.xml diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml index 193c529a6..30423de02 100755 --- a/core/taskpool/pom.xml +++ b/core/taskpool/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../../bom/parent/pom.xml diff --git a/core/taskpool/taskpool-api/pom.xml b/core/taskpool/taskpool-api/pom.xml index 053ee47d7..9cb6a8058 100755 --- a/core/taskpool/taskpool-api/pom.xml +++ b/core/taskpool/taskpool-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-taskpool-api diff --git a/core/taskpool/taskpool-core/pom.xml b/core/taskpool/taskpool-core/pom.xml index 99d6c532c..ee07a894c 100755 --- a/core/taskpool/taskpool-core/pom.xml +++ b/core/taskpool/taskpool-core/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-taskpool-core diff --git a/core/taskpool/taskpool-event/pom.xml b/core/taskpool/taskpool-event/pom.xml index 340ff1111..b2401b315 100644 --- a/core/taskpool/taskpool-event/pom.xml +++ b/core/taskpool/taskpool-event/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-taskpool-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-taskpool-event diff --git a/integration/camunda-bpm/engine-client/pom.xml b/integration/camunda-bpm/engine-client/pom.xml index f12d13ef3..cdd868fd6 100644 --- a/integration/camunda-bpm/engine-client/pom.xml +++ b/integration/camunda-bpm/engine-client/pom.xml @@ -4,7 +4,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-camunda-bpm-engine-client diff --git a/integration/camunda-bpm/pom.xml b/integration/camunda-bpm/pom.xml index 6eb1b8fa2..c141906a0 100644 --- a/integration/camunda-bpm/pom.xml +++ b/integration/camunda-bpm/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../../bom/parent/pom.xml diff --git a/integration/camunda-bpm/springboot-autoconfigure/pom.xml b/integration/camunda-bpm/springboot-autoconfigure/pom.xml index 9acdd4f64..5867c6274 100755 --- a/integration/camunda-bpm/springboot-autoconfigure/pom.xml +++ b/integration/camunda-bpm/springboot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-camunda-bpm-springboot-autoconfigure diff --git a/integration/camunda-bpm/springboot-starter/pom.xml b/integration/camunda-bpm/springboot-starter/pom.xml index 6c2b9158b..78d5992f2 100755 --- a/integration/camunda-bpm/springboot-starter/pom.xml +++ b/integration/camunda-bpm/springboot-starter/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-camunda-bpm-springboot-starter diff --git a/integration/camunda-bpm/taskpool-collector/pom.xml b/integration/camunda-bpm/taskpool-collector/pom.xml index dd7252f6f..f7791d045 100755 --- a/integration/camunda-bpm/taskpool-collector/pom.xml +++ b/integration/camunda-bpm/taskpool-collector/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-camunda-bpm-taskpool-collector diff --git a/integration/camunda-bpm/taskpool-job-sender/pom.xml b/integration/camunda-bpm/taskpool-job-sender/pom.xml index 497af6a49..a0305b9c6 100755 --- a/integration/camunda-bpm/taskpool-job-sender/pom.xml +++ b/integration/camunda-bpm/taskpool-job-sender/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-camunda-bpm-engine-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-camunda-bpm-taskpool-job-sender diff --git a/integration/common/datapool-sender/pom.xml b/integration/common/datapool-sender/pom.xml index c1dce3f33..9389aa42b 100755 --- a/integration/common/datapool-sender/pom.xml +++ b/integration/common/datapool-sender/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-datapool-sender diff --git a/integration/common/pom.xml b/integration/common/pom.xml index 481477720..5250bc52b 100755 --- a/integration/common/pom.xml +++ b/integration/common/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../../bom/parent/pom.xml diff --git a/integration/common/tasklist-url-resolver/pom.xml b/integration/common/tasklist-url-resolver/pom.xml index 97d86dbe0..b711b8e06 100644 --- a/integration/common/tasklist-url-resolver/pom.xml +++ b/integration/common/tasklist-url-resolver/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-tasklist-url-resolver diff --git a/integration/common/taskpool-sender/pom.xml b/integration/common/taskpool-sender/pom.xml index cc06b813e..b0509df17 100755 --- a/integration/common/taskpool-sender/pom.xml +++ b/integration/common/taskpool-sender/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-taskpool-sender diff --git a/integration/common/variable-serializer/pom.xml b/integration/common/variable-serializer/pom.xml index 22532cfab..49f5758ad 100755 --- a/integration/common/variable-serializer/pom.xml +++ b/integration/common/variable-serializer/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-integration-common-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-variable-serializer diff --git a/pom.xml b/pom.xml index cb80f654f..5c77c9767 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-root - 3.14.3-SNAPSHOT + 3.14.3 pom POM: ${project.artifactId} diff --git a/view/form-url-resolver/pom.xml b/view/form-url-resolver/pom.xml index 5c0bcd43a..39e136a7d 100644 --- a/view/form-url-resolver/pom.xml +++ b/view/form-url-resolver/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-form-url-resolver diff --git a/view/jpa/pom.xml b/view/jpa/pom.xml index 006cb7556..4c6bacfed 100644 --- a/view/jpa/pom.xml +++ b/view/jpa/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-view-jpa diff --git a/view/mongo/pom.xml b/view/mongo/pom.xml index 99c6696c1..4b532c1ed 100755 --- a/view/mongo/pom.xml +++ b/view/mongo/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-view-mongo diff --git a/view/pom.xml b/view/pom.xml index 4a10e4c94..5d0020d5e 100644 --- a/view/pom.xml +++ b/view/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-parent - 3.14.3-SNAPSHOT + 3.14.3 ../bom/parent/pom.xml diff --git a/view/simple/pom.xml b/view/simple/pom.xml index c9e994698..e8954c7a9 100755 --- a/view/simple/pom.xml +++ b/view/simple/pom.xml @@ -5,7 +5,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-view-simple diff --git a/view/view-api-client/pom.xml b/view/view-api-client/pom.xml index 9b01124dc..f378fc9f8 100755 --- a/view/view-api-client/pom.xml +++ b/view/view-api-client/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-view-api-client diff --git a/view/view-api/pom.xml b/view/view-api/pom.xml index 4625a40b1..a9ff949f6 100755 --- a/view/view-api/pom.xml +++ b/view/view-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.polyflow polyflow-view-parent - 3.14.3-SNAPSHOT + 3.14.3 polyflow-view-api