Skip to content

Commit

Permalink
Merge branch 'release/3.12.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Jun 5, 2023
2 parents 4a613b9 + 5acd9f0 commit f174c40
Show file tree
Hide file tree
Showing 52 changed files with 265 additions and 85 deletions.
2 changes: 1 addition & 1 deletion bom/datapool-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
12 changes: 6 additions & 6 deletions bom/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-root</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<url>https://github.com/holunda-io/camunda-bpm-taskpool/</url>

<properties>
<springboot.version>2.7.11</springboot.version>
<springboot.version>2.7.12</springboot.version>
<camunda-commons-typed-values.version>7.18.0</camunda-commons-typed-values.version>

<axon-bom.version>4.6.6</axon-bom.version>
Expand Down Expand Up @@ -513,7 +513,7 @@

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<runOrder>random</runOrder>
Expand All @@ -534,7 +534,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -574,7 +574,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -594,7 +594,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down
2 changes: 1 addition & 1 deletion bom/taskpool-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/bus-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/datapool/datapool-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-datapool-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/datapool/datapool-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-datapool-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/datapool/datapool-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-datapool-event</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/datapool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-taskpool-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-taskpool-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-taskpool-event</artifactId>
Expand Down
10 changes: 9 additions & 1 deletion docs/reference-guide/components/view-api-client.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in order to query the configured views. By doing so, it defines an easy-to-use A

## Usage

Pleas put the following component to you class path:
Please put the following component to you class path:

```xml
<dependency>
Expand All @@ -22,4 +22,12 @@ The components available are:
* `io.holunda.polyflow.view.ProcessVariableQueryClient`
* `io.holunda.polyflow.view.TaskQueryClient`

To initialize the client, you need to pass the `queryGateway` to it:

```kotlin
@Bean
fun myTaskClient(queryGateway: QueryGateway) = TaskQueryClient(queryGateway)

```

If you are using Kotlin, you might like the extension functions of the `QueryGateway` provided by `io.holunda.polyflow.view.QueryGatewayExt` object.
27 changes: 14 additions & 13 deletions docs/reference-guide/components/view-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@ and generic query paging and sorting.

The Task API allows to query for tasks handled by the task-pool.

| Query Type | Description | Payload types | In-Memory | JPA | Mongo DB |
|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|-----------|------------|----------|
| AllTasksQuery | Retrieves a list of tasks applying additional filters | List<Task> | yes | yes | no |
| TasksForUserQuery | Retrieves a list of tasks accessible by the user and applying additional filters | List<Task> | yes | yes | yes |
| TasksForGroupQuery | Retrieves a list of tasks accessible by the user's group and applying additional filters | List<Task> | yes | yes | no |
| TaskForIdQuery | Retrieves a task by id (without any other filters) | Task or null | yes | yes | yes |
| TasksForApplicationQuery | Retrieves all tasks by given application name (without any further filters) | List<Task> | yes | yes | yes |
| AllTasksWithDataEntriesQuery | Retrieves a list of tasks applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | no |
| TasksWithDataEntriesForGroupQuery | Retrieves a list of tasks accessible by the user's group and applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | no |
| TasksWithDataEntriesForUserQuery | Retrieves a list of tasks accessible by the user and applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | yes |
| TaskWithDataEntriesForIdQuery | Retrieves a task by id and correlates result with data entries, if available | (Task, List<DataEntry>) or null | yes | yes | yes |
| TaskCountByApplicationQuery | Counts tasks grouped by application names, useful for monitoring | List<(ApplicationName, Count)> | yes | no | yes |
| Query Type | Description | Payload types | In-Memory | JPA | Mongo DB |
|-------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|-----------|------------|----------|
| AllTasksQuery | Retrieves a list of tasks applying additional filters | List<Task> | yes | yes | no |
| TasksForUserQuery | Retrieves a list of tasks accessible by the user and applying additional filters | List<Task> | yes | yes | yes |
| TasksForGroupQuery | Retrieves a list of tasks accessible by the user's group and applying additional filters | List<Task> | yes | yes | no |
| TasksForCandidateUserAndGroupQuery | Retrieves a list of tasks accessible by the user because listed as candidate and the user's group and applying additional filters | List<Task> | yes | yes | no |
| TaskForIdQuery | Retrieves a task by id (without any other filters) | Task or null | yes | yes | yes |
| TasksForApplicationQuery | Retrieves all tasks by given application name (without any further filters) | List<Task> | yes | yes | yes |
| AllTasksWithDataEntriesQuery | Retrieves a list of tasks applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | no |
| TasksWithDataEntriesForGroupQuery | Retrieves a list of tasks accessible by the user's group and applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | no |
| TasksWithDataEntriesForUserQuery | Retrieves a list of tasks accessible by the user and applying additional filters and correlates result with data entries, if available | List<(Task, List<DataEntry>) | yes | incubation | yes |
| TaskWithDataEntriesForIdQuery | Retrieves a task by id and correlates result with data entries, if available | (Task, List<DataEntry>) or null | yes | yes | yes |
| TaskCountByApplicationQuery | Counts tasks grouped by application names, useful for monitoring | List<(ApplicationName, Count)> | yes | no | yes |


### Process Definition API
Expand Down Expand Up @@ -90,7 +91,7 @@ for more details. Please note, that not all implementations are implementing thi

## Filtering, Paging and Sorting

Task API and Data Entries API supports filtering, paging and sorting in queries resulting in multiple results. For Task API these are `AllTasksQuery`, `TasksForGroupQuery`, `TasksForUserQuery`,
Task API and Data Entries API supports filtering, paging and sorting in queries resulting in multiple results. For Task API these are `AllTasksQuery`, `TasksForGroupQuery`, `TasksForUserQuery`, `TasksForCandidateUserAndGroupQuery`,
`AllTasksWithDataEntriesQuery`, `TasksWithDataEntriesForGroupQuery`, `TasksWithDataEntriesForUserQuery` and for Data Entries API these are `DataEntriesForUserQuery` and `DataEntriesQuery`.
The queries implement the `PageableSortableQuery` interface, allowing to limit the amount of results and provide an optional sorting:

Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/engine-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-engine-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/springboot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/springboot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/taskpool-collector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TaskCommandProcessor(
taskAssigner.setAssignment(it)
}.also { commandToSend ->
if (logger.isTraceEnabled) {
logger.trace("COLLECTOR-008: Sending engine task command: $commandToSend.")
logger.trace {"COLLECTOR-008: Sending engine task command: $commandToSend." }
}
// enrich and send
engineTaskCommandSender.send(commandToSend)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ class TaskEventCollectorService(
// this method is intentionally empty to demonstrate that the assign event is captured.
// we hence rely on historic identity link events to capture assignment via API and via listeners more accurately.
// see implementation below
if (logger.isTraceEnabled) {
logger.trace { "Task ${task.id} is assigned to ${task.assignee}." }
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/taskpool-job-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class CamundaJobSenderConfiguration(
processEngineConfiguration: ProcessEngineConfigurationImpl,
@Qualifier(COMMAND_BYTEARRAY_OBJECT_MAPPER)
objectMapper: ObjectMapper,
commandListGateway: CommandListGateway,
engineTaskCommandAccumulator: EngineTaskCommandAccumulator
): EngineTaskCommandSender =
TxAwareAccumulatingCamundaJobEngineTaskCommandSender(
Expand Down
2 changes: 1 addition & 1 deletion integration/common/datapool-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-datapool-sender</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/common/tasklist-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-tasklist-url-resolver</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/taskpool-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-taskpool-sender</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/variable-serializer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-variable-serializer</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-root</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
<packaging>pom</packaging>

<name>POM: ${project.artifactId}</name>
Expand Down Expand Up @@ -159,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<configuration>
<!-- pass -Dgpg.keyname=.. and -Dgpg.passphrase=... -->
<gpgArguments>
Expand Down
2 changes: 1 addition & 1 deletion view/form-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-view-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-form-url-resolver</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions view/jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-view-parent</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</parent>

<artifactId>polyflow-view-jpa</artifactId>
Expand Down Expand Up @@ -233,7 +233,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>12.2.0.jre11</version>
<version>12.3.0.jre11-preview</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
Loading

0 comments on commit f174c40

Please sign in to comment.