Merge branch 'release/2025.05.5'

zambrovski · zambrovski · commit 01ee4e0e099f · 2025-05-28T09:43:21.000+02:00
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
   </parent>
 
   <artifactId>process-engine-adapter-camunda-platform-c7-bom</artifactId>
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-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/c7-embedded-core/pom.xml b/engine-adapter/c7-embedded-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/c7-embedded-spring-boot-starter/pom.xml b/engine-adapter/c7-embedded-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/c7-remote-core/pom.xml b/engine-adapter/c7-remote-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/completion/NoOpServiceTaskCompletionApiImpl.kt b/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/completion/NoOpServiceTaskCompletionApiImpl.kt
@@ -0,0 +1,23 @@
+package dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion
+
+import dev.bpmcrafters.processengineapi.Empty
+import dev.bpmcrafters.processengineapi.task.CompleteTaskByErrorCmd
+import dev.bpmcrafters.processengineapi.task.CompleteTaskCmd
+import dev.bpmcrafters.processengineapi.task.FailTaskCmd
+import dev.bpmcrafters.processengineapi.task.ServiceTaskCompletionApi
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Future
+
+class NoOpServiceTaskCompletionApiImpl : ServiceTaskCompletionApi {
+  override fun completeTask(cmd: CompleteTaskCmd): Future<Empty> {
+    return CompletableFuture.completedFuture(Empty)
+  }
+
+  override fun completeTaskByError(cmd: CompleteTaskByErrorCmd): Future<Empty> {
+    return CompletableFuture.completedFuture(Empty)
+  }
+
+  override fun failTask(cmd: FailTaskCmd): Future<Empty> {
+    return CompletableFuture.completedFuture(Empty)
+  }
+}
diff --git a/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/completion/NoOpUserTaskCompletionApiImpl.kt b/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/completion/NoOpUserTaskCompletionApiImpl.kt
@@ -0,0 +1,19 @@
+package dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion
+
+import dev.bpmcrafters.processengineapi.Empty
+import dev.bpmcrafters.processengineapi.task.CompleteTaskByErrorCmd
+import dev.bpmcrafters.processengineapi.task.CompleteTaskCmd
+import dev.bpmcrafters.processengineapi.task.UserTaskCompletionApi
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Future
+
+class NoOpUserTaskCompletionApiImpl : UserTaskCompletionApi {
+
+  override fun completeTask(cmd: CompleteTaskCmd): Future<Empty> {
+    return CompletableFuture.completedFuture(Empty)
+  }
+
+  override fun completeTaskByError(cmd: CompleteTaskByErrorCmd): Future<Empty> {
+    return CompletableFuture.completedFuture(Empty)
+  }
+}
diff --git a/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/TaskInformationExtensions.kt b/engine-adapter/c7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/TaskInformationExtensions.kt
@@ -72,7 +72,7 @@ fun Date?.toDateString() = this?.toInstant()?.toIso8601() ?: ""
 /**
  * Converts offset date time to string representation in ISO8601 in UTC.
  */
-fun OffsetDateTime?.toDateString() = this?.atZoneSameInstant(ZoneOffset.UTC).toString()
+fun OffsetDateTime?.toDateString() = this?.atZoneSameInstant(ZoneOffset.UTC)?.toString() ?: ""
 
 /**
  * Converts to offset date time in ISO8601 in UTC.
diff --git a/engine-adapter/c7-remote-core/src/test/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/TaskInformationExtensionsKtTest.kt b/engine-adapter/c7-remote-core/src/test/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/TaskInformationExtensionsKtTest.kt
@@ -83,7 +83,52 @@ class TaskInformationExtensionsKtTest {
     assertThat(taskInformation.meta[CommonRestrictions.TENANT_ID]).isEqualTo("tenantId")
     assertThat(taskInformation.meta["topicName"]).isEqualTo("topicName")
     assertThat(taskInformation.meta["creationDate"]).isEqualTo(now.toDateString())
+  }
+
+  @Test
+  fun `should map null date to empty string for TaskWithAttachmentAndCommentDto`() {
+
+    val task = TaskWithAttachmentAndCommentDto()
+      .id("taskId")
+      .processDefinitionId("processDefinitionId")
+      .processInstanceId("processInstanceId")
+      .tenantId("tenantId")
+      .taskDefinitionKey("taskDefinitionKey")
+      .name("name")
+      .description("description")
+      .assignee("assignee")
+      .formKey("formKey")
+      .created(null)
+      .followUp(null)
+      .due(null)
+      .lastUpdated(null)
+
+    val taskInformation = task.toTaskInformation(setOf(), processDefinitionMetaDataResolver)
+
+    assertThat(taskInformation.meta["creationDate"]).isEqualTo("")
+    assertThat(taskInformation.meta["followUpDate"]).isEqualTo("")
+    assertThat(taskInformation.meta["dueDate"]).isEqualTo("")
+    assertThat(taskInformation.meta["lastUpdatedDate"]).isEqualTo("")
+  }
+
+  @Test
+  fun `should map null date to empty string for LockedExternalTaskDto`() {
+    val now = OffsetDateTime.now()
+
+    val lockedTask = LockedExternalTaskDto()
+      .processDefinitionId("processDefinitionId")
+      .processInstanceId("processInstanceId")
+      .tenantId("tenantId")
+      .topicName("topicName")
+      .id("taskId")
+      .activityId("activityId")
+      .activityInstanceId("activityInstanceId")
+      .createTime(null)
+
+
+    val taskInformation = lockedTask.toTaskInformation(processDefinitionMetaDataResolver)
 
+    assertThat(taskInformation.meta["creationDate"]).isEqualTo("")
   }
 
   private fun identityLink(userId: String? = null, groupId: String? = null): IdentityLinkDto {
diff --git a/engine-adapter/c7-remote-spring-boot-starter/pom.xml b/engine-adapter/c7-remote-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteAdapterAutoConfiguration.kt b/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteAdapterAutoConfiguration.kt
@@ -8,15 +8,13 @@ import dev.bpmcrafters.processengineapi.adapter.c7.remote.process.StartProcessAp
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.TaskSubscriptionApiImpl
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.FailureRetrySupplier
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.LinearMemoryFailureRetrySupplier
-import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.UserTaskCompletionApiImpl
 import dev.bpmcrafters.processengineapi.correlation.CorrelationApi
 import dev.bpmcrafters.processengineapi.correlation.SignalApi
 import dev.bpmcrafters.processengineapi.deploy.DeploymentApi
 import dev.bpmcrafters.processengineapi.impl.task.InMemSubscriptionRepository
 import dev.bpmcrafters.processengineapi.impl.task.SubscriptionRepository
 import dev.bpmcrafters.processengineapi.process.StartProcessApi
 import dev.bpmcrafters.processengineapi.task.TaskSubscriptionApi
-import dev.bpmcrafters.processengineapi.task.UserTaskCompletionApi
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.toolisticon.spring.condition.ConditionalOnMissingQualifiedBean
 import jakarta.annotation.PostConstruct
@@ -43,7 +41,6 @@ class C7RemoteAdapterAutoConfiguration {
     logger.debug { "PROCESS-ENGINE-C7-REMOTE-200: Configuration applied." }
   }
 
-
   @Bean("c7remote-task-subscription-api")
   @Qualifier("c7remote-task-subscription-api")
   fun taskSubscriptionApi(subscriptionRepository: SubscriptionRepository): TaskSubscriptionApi = TaskSubscriptionApiImpl(
@@ -109,22 +106,6 @@ class C7RemoteAdapterAutoConfiguration {
   @ConditionalOnMissingQualifiedBean(beanClass = ExecutorService::class, qualifier = "c7remote-user-task-worker-executor")
   fun userTaskWorkerExecutor(): ExecutorService = Executors.newFixedThreadPool(10)
 
-  /**
-   * User completion API.
-   */
-  @Bean("c7remote-user-task-completion-api")
-  @Qualifier("c7remote-user-task-completion-api")
-  fun userTaskCompletionApi(
-    taskApiClient: TaskApiClient,
-    subscriptionRepository: SubscriptionRepository,
-    valueMapper: ValueMapper,
-  ): UserTaskCompletionApi =
-    UserTaskCompletionApiImpl(
-      taskApiClient = taskApiClient,
-      subscriptionRepository = subscriptionRepository,
-      valueMapper = valueMapper
-    )
-
   /**
    * Failure retry supplier.
    */
diff --git a/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteNoOpConfiguration.kt b/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteNoOpConfiguration.kt
@@ -0,0 +1,37 @@
+package dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot
+
+import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.NoOpServiceTaskCompletionApiImpl
+import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.NoOpUserTaskCompletionApiImpl
+import dev.bpmcrafters.processengineapi.task.ServiceTaskCompletionApi
+import dev.bpmcrafters.processengineapi.task.UserTaskCompletionApi
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.springframework.boot.autoconfigure.AutoConfiguration
+import org.springframework.boot.autoconfigure.AutoConfigureAfter
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Conditional
+
+private val logger = KotlinLogging.logger {}
+
+@AutoConfiguration
+@AutoConfigureAfter(C7RemoteAdapterAutoConfiguration::class)
+@Conditional(C7RemoteAdapterEnabledCondition::class)
+class C7RemoteNoOpConfiguration {
+
+  @ConditionalOnUserTaskDeliveryStrategy(
+    strategy = C7RemoteAdapterProperties.UserTaskDeliveryStrategy.DISABLED
+  )
+  @Bean
+  fun noOpUserTaskCompletionApi(): UserTaskCompletionApi {
+    logger.info { "PROCESS-ENGINE-C7-REMOTE-210: Configured a NO-OP UserTaskCompletion API, no user task completion is possible." }
+    return NoOpUserTaskCompletionApiImpl()
+  }
+
+  @ConditionalOnServiceTaskDeliveryStrategy(
+    strategy = C7RemoteAdapterProperties.ExternalServiceTaskDeliveryStrategy.DISABLED
+  )
+  @Bean
+  fun noOpServiceTaskCompletionApi(): ServiceTaskCompletionApi {
+    logger.info { "PROCESS-ENGINE-C7-REMOTE-211: Configured a NO-OP ServiceTaskCompletion API, no service task completion is possible." }
+    return NoOpServiceTaskCompletionApiImpl()
+  }
+}
diff --git a/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemotePullServicesAutoConfiguration.kt b/engine-adapter/c7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemotePullServicesAutoConfiguration.kt
@@ -4,10 +4,12 @@ import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.Failur
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.FeignServiceTaskCompletionApiImpl
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.process.CachingProcessDefinitionMetaDataResolver
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.process.ProcessDefinitionMetaDataResolver
+import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.UserTaskCompletionApiImpl
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull.PullServiceTaskDelivery
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull.PullUserTaskDelivery
 import dev.bpmcrafters.processengineapi.impl.task.SubscriptionRepository
 import dev.bpmcrafters.processengineapi.task.ServiceTaskCompletionApi
+import dev.bpmcrafters.processengineapi.task.UserTaskCompletionApi
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.toolisticon.spring.condition.ConditionalOnMissingQualifiedBean
 import jakarta.annotation.PostConstruct
@@ -133,4 +135,24 @@ class C7RemotePullServicesAutoConfiguration {
     )
   }
 
+  /**
+   * User completion API.
+   */
+  @Bean("c7remote-user-task-completion-api")
+  @Qualifier("c7remote-user-task-completion-api")
+  @ConditionalOnUserTaskDeliveryStrategy(
+    strategy = C7RemoteAdapterProperties.UserTaskDeliveryStrategy.REMOTE_SCHEDULED
+  )
+  fun userTaskCompletionApi(
+    taskApiClient: TaskApiClient,
+    subscriptionRepository: SubscriptionRepository,
+    valueMapper: ValueMapper,
+  ): UserTaskCompletionApi =
+    UserTaskCompletionApiImpl(
+      taskApiClient = taskApiClient,
+      subscriptionRepository = subscriptionRepository,
+      valueMapper = valueMapper
+    )
+
+
 }
diff --git a/engine-adapter/c7-remote-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/engine-adapter/c7-remote-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,6 +1,7 @@
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.feign.FeignClientAutoConfiguration
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.C7RemoteAdapterAutoConfiguration
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.C7RemotePullServicesAutoConfiguration
+dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.C7RemoteNoOpConfiguration
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.schedule.PullServiceTaskDeliveryAutoConfiguration
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.schedule.PullUserTaskDeliveryAutoConfiguration
 dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot.client.OfficialClientServiceTaskAutoConfiguration
diff --git a/engine-adapter/c7-remote-spring-boot-starter/src/test/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteAdapterConditionsTest.kt b/engine-adapter/c7-remote-spring-boot-starter/src/test/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/C7RemoteAdapterConditionsTest.kt
@@ -1,9 +1,12 @@
 package dev.bpmcrafters.processengineapi.adapter.c7.remote.springboot
 
+import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.NoOpServiceTaskCompletionApiImpl
+import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.completion.NoOpUserTaskCompletionApiImpl
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull.PullServiceTaskDelivery
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.pull.PullUserTaskDelivery
 import dev.bpmcrafters.processengineapi.adapter.c7.remote.task.delivery.subscribe.SubscribingServiceTaskDelivery
 import dev.bpmcrafters.processengineapi.task.ServiceTaskCompletionApi
+import dev.bpmcrafters.processengineapi.task.UserTaskCompletionApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -75,12 +78,11 @@ class C7RemoteAdapterDisabledConditionsTest {
     assertThrows<NoSuchBeanDefinitionException> {
       context.getBean(PullServiceTaskDelivery::class.java)
     }
-    assertThrows<NoSuchBeanDefinitionException> {
-      context.getBean(ServiceTaskCompletionApi::class.java)
-    }
     assertThrows<NoSuchBeanDefinitionException> {
       context.getBean(PullUserTaskDelivery::class.java)
     }
+    assertThat(context.getBean(ServiceTaskCompletionApi::class.java)).isInstanceOf(NoOpServiceTaskCompletionApiImpl::class.java)
+    assertThat(context.getBean(UserTaskCompletionApi::class.java)).isInstanceOf(NoOpUserTaskCompletionApiImpl::class.java)
   }
 
 }
diff --git a/examples/java-c7-embedded/pom.xml b/examples/java-c7-embedded/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dev.bpm-crafters.process-engine-examples</groupId>
     <artifactId>process-engine-api-example-root-c7</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</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-examples</groupId>
     <artifactId>process-engine-api-example-root-c7</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</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-examples</groupId>
     <artifactId>process-engine-api-example-root-c7</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</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-adapters</groupId>
     <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-    <version>2025.05.4</version>
+    <version>2025.05.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>dev.bpm-crafters.process-engine-adapters</groupId>
   <artifactId>process-engine-adapter-camunda-platform-c7-root</artifactId>
-  <version>2025.05.4</version>
+  <version>2025.05.5</version>
   <name>POM: Camunda 7 Adapter Project root</name>
   <description>Process Engine Adapters Camunda 7</description>
   <url>https://github.com/bpm-crafters/process-engine-adapters-camunda-7/</url>
