Merge branch 'release/0.4.4'

zambrovski · zambrovski · commit ba5ce93e6751 · 2025-02-26T14:08:44.000+01:00
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -13,6 +13,16 @@ on:
       - '*/*'       # matches every branch containing a single '/'
       - '**'        # matches every branch
       - '!master'
+  workflow_dispatch:
+    inputs:
+      skip_tests:
+        description: "Skip tests?"
+        required: true
+        default: "false"
+        type: choice
+        options:
+          - "true"
+          - "false"
 
 jobs:
   build:
@@ -34,13 +44,31 @@ jobs:
           distribution: 'zulu'
           cache: maven
 
+      - name: Determine if Tests Should Be Skipped
+        id: check_skip_tests
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/skip-tests" ]]; then
+            echo "SKIP_TESTS=true" >> $GITHUB_ENV
+          elif [[ "${{ github.event.head_commit.message }}" == *"[skip-tests]"* ]]; then
+            echo "SKIP_TESTS=true" >> $GITHUB_ENV
+          elif [[ "${{ github.event.inputs.skip_tests }}" == "true" ]]; then
+            echo "SKIP_TESTS=true" >> $GITHUB_ENV
+          else
+            echo "SKIP_TESTS=false" >> $GITHUB_ENV
+          fi
+
       # Prepare
       - name: Prepare Maven Wrapper
         run: chmod +x ./mvnw
 
       # Build
       - name: Build with Maven
-        run: ./mvnw clean verify -U -B -ntp -T4
+        run: |
+          if [[ "$SKIP_TESTS" == "true" ]]; then
+            ./mvnw clean verify -U -B -ntp -T4 -DskipTests
+          else
+            ./mvnw clean verify -U -B -ntp -T4
+          fi
 
       - name: Upload coverage to Codecov
         if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>process-engine-api</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>process-engine-api-bom</artifactId>
diff --git a/engine-adapter/adapter-commons-spring-boot-starter/pom.xml b/engine-adapter/adapter-commons-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/adapter-commons/pom.xml b/engine-adapter/adapter-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/adapter-testing/pom.xml b/engine-adapter/adapter-testing/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-7-embedded-core/pom.xml b/engine-adapter/camunda-platform-7-embedded-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/pull/CachingProcessDefinitionKeyResolver.kt b/engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/pull/CachingProcessDefinitionKeyResolver.kt
@@ -2,9 +2,13 @@ package dev.bpmcrafters.processengineapi.adapter.c7.embedded.task.delivery.pull
 
 import org.camunda.bpm.engine.RepositoryService
 
+/**
+ * Simple in-memory caching resolver for process definition for a given process definition id.
+ */
 data class CachingProcessDefinitionKeyResolver(
   val repositoryService: RepositoryService,
-  private val keys: MutableMap<String, String> = mutableMapOf()
+  private val keys: MutableMap<String, String> = mutableMapOf(),
+  private val versionTags: MutableMap<String, String> = mutableMapOf()
 ) {
 
   /**
@@ -25,4 +29,24 @@ data class CachingProcessDefinitionKeyResolver(
       }
     }
   }
+
+  /**
+   * Resolves process definition version tag from repository service and uses an in-mem cache.
+   * @param processDefinitionId process definition id.
+   * @return corresponding version tag.
+   */
+  fun getProcessDefinitionVersionTag(processDefinitionId: String?): String? {
+    return if (processDefinitionId == null) {
+      null
+    } else {
+      return versionTags.getOrPut(processDefinitionId) {
+        repositoryService
+          .createProcessDefinitionQuery()
+          .processDefinitionId(processDefinitionId)
+          .singleResult()
+          .versionTag
+      }
+    }
+  }
+
 }
diff --git a/engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/pull/EmbeddedPullUserTaskDelivery.kt b/engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/pull/EmbeddedPullUserTaskDelivery.kt
@@ -34,7 +34,7 @@ class EmbeddedPullUserTaskDelivery(
    * Delivers all tasks found in user task service to corresponding subscriptions.
    */
   override fun refresh() {
-    val subscriptions = subscriptionRepository.getTaskSubscriptions()
+    val subscriptions = subscriptionRepository.getTaskSubscriptions().filter { s -> s.taskType == TaskType.USER }
     if (subscriptions.isNotEmpty()) {
       logger.trace { "PROCESS-ENGINE-C7-EMBEDDED-036: pulling user tasks for subscriptions: $subscriptions" }
       taskService
@@ -85,6 +85,8 @@ class EmbeddedPullUserTaskDelivery(
         CommonRestrictions.TENANT_ID -> it.value == task.tenantId
         CommonRestrictions.PROCESS_INSTANCE_ID -> it.value == task.processInstanceId
         CommonRestrictions.PROCESS_DEFINITION_ID -> it.value == task.processDefinitionId
+        CommonRestrictions.PROCESS_DEFINITION_KEY -> it.value == cachingProcessDefinitionKeyResolver.getProcessDefinitionKey(task.processDefinitionId)
+        CommonRestrictions.PROCESS_DEFINITION_VERSION_TAG -> it.value == cachingProcessDefinitionKeyResolver.getProcessDefinitionVersionTag(task.processDefinitionId)
         else -> false
       }
     }
diff --git a/engine-adapter/camunda-platform-7-embedded-spring-boot-starter/pom.xml b/engine-adapter/camunda-platform-7-embedded-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-7-remote-core/pom.xml b/engine-adapter/camunda-platform-7-remote-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/pull/CachingProcessDefinitionKeyResolver.kt b/engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/pull/CachingProcessDefinitionKeyResolver.kt
@@ -0,0 +1,51 @@
+package dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull
+
+import org.camunda.bpm.engine.RepositoryService
+
+/**
+ * Simple in-memory caching resolver for process definition for a given process definition id.
+ */
+data class CachingProcessDefinitionKeyResolver(
+  val repositoryService: RepositoryService,
+  private val keys: MutableMap<String, String> = mutableMapOf(),
+  private val versionTags: MutableMap<String, String> = mutableMapOf()
+) {
+
+  /**
+   * Resolves process definition key from repository service and uses an in-mem cache.
+   * @param processDefinitionId process definition id.
+   * @return corresponding key.
+   */
+  fun getProcessDefinitionKey(processDefinitionId: String?): String? {
+    return if (processDefinitionId == null) {
+      null
+    } else {
+      return keys.getOrPut(processDefinitionId) {
+        repositoryService
+          .createProcessDefinitionQuery()
+          .processDefinitionId(processDefinitionId)
+          .singleResult()
+          .key
+      }
+    }
+  }
+
+  /**
+   * Resolves process definition version tag from repository service and uses an in-mem cache.
+   * @param processDefinitionId process definition id.
+   * @return corresponding version tag.
+   */
+  fun getProcessDefinitionVersionTag(processDefinitionId: String?): String? {
+    return if (processDefinitionId == null) {
+      null
+    } else {
+      return versionTags.getOrPut(processDefinitionId) {
+        repositoryService
+          .createProcessDefinitionQuery()
+          .processDefinitionId(processDefinitionId)
+          .singleResult()
+          .versionTag
+      }
+    }
+  }
+}
diff --git a/engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/pull/RemotePullUserTaskDelivery.kt b/engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/pull/RemotePullUserTaskDelivery.kt
@@ -1,5 +1,6 @@
 package dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull
 
+import dev.bpmcrafters.processengineapi.CommonRestrictions
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.UserTaskDelivery
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.toTaskInformation
 import dev.bpmcrafters.processengineapi.adapter.commons.task.RefreshableDelivery
@@ -27,6 +28,8 @@ class RemotePullUserTaskDelivery(
   private val executorService: ExecutorService
 ) : UserTaskDelivery, RefreshableDelivery {
 
+  private val cachingProcessDefinitionKeyResolver = CachingProcessDefinitionKeyResolver(repositoryService)
+
   /**
    * Delivers all tasks found in user task service to corresponding subscriptions.
    */
@@ -71,10 +74,19 @@ class RemotePullUserTaskDelivery(
 
 
   private fun TaskSubscriptionHandle.matches(task: Task): Boolean =
-    this.taskDescriptionKey == null
+    (this.taskDescriptionKey == null
       || this.taskDescriptionKey == task.taskDefinitionKey
-      || this.taskDescriptionKey == task.id
-    // FIXME -> support tenant
-
+      || this.taskDescriptionKey == task.id)
+      && this.restrictions.all {
+      when (it.key) {
+        CommonRestrictions.EXECUTION_ID -> it.value == task.executionId
+        CommonRestrictions.TENANT_ID -> it.value == task.tenantId
+        CommonRestrictions.PROCESS_INSTANCE_ID -> it.value == task.processInstanceId
+        CommonRestrictions.PROCESS_DEFINITION_ID -> it.value == task.processDefinitionId
+        CommonRestrictions.PROCESS_DEFINITION_KEY -> it.value == cachingProcessDefinitionKeyResolver.getProcessDefinitionKey(task.processDefinitionId)
+        CommonRestrictions.PROCESS_DEFINITION_VERSION_TAG -> it.value == cachingProcessDefinitionKeyResolver.getProcessDefinitionVersionTag(task.processDefinitionId)
+        else -> false
+      }
+    }
 }
 
diff --git a/engine-adapter/camunda-platform-7-remote-spring-boot-starter/pom.xml b/engine-adapter/camunda-platform-7-remote-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-8-core/pom.xml b/engine-adapter/camunda-platform-8-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/camunda-platform-8-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c8/task/delivery/PullUserTaskDelivery.kt b/engine-adapter/camunda-platform-8-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c8/task/delivery/PullUserTaskDelivery.kt
@@ -14,6 +14,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 
 private val logger = KotlinLogging.logger {}
 
+@Deprecated("Will be removed as soon as tasklist becomes part of the engine.")
 class PullUserTaskDelivery(
   private val taskListClient: CamundaTaskListClient,
   private val subscriptionRepository: SubscriptionRepository
diff --git a/engine-adapter/camunda-platform-8-spring-boot-starter/pom.xml b/engine-adapter/camunda-platform-8-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/java-c7-remote/pom.xml b/examples/java-c7-remote/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-examples</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/java-c7/pom.xml b/examples/java-c7/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-examples</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/java-c8/pom.xml b/examples/java-c8/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-examples</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/java-common-fixture/pom.xml b/examples/java-common-fixture/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-examples</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-api</groupId>
     <artifactId>process-engine-api-root</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>dev.bpm-crafters.process-engine-api</groupId>
   <artifactId>process-engine-api-root</artifactId>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <name>POM: Project root</name>
   <description>Process Engine API</description>
   <url>https://github.com/bpm-crafters/process-engine-api/</url>
