Merge branch 'release/3.4.0'

bom/datapool-dependencies/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

bom/parent/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,10 +21,10 @@
     <springboot.version>2.7.5</springboot.version>
     <camunda-commons-typed-values.version>7.18.0</camunda-commons-typed-values.version>
 
-    <axon-bom.version>4.6.1</axon-bom.version>
+    <axon-bom.version>4.6.2</axon-bom.version>
 
     <axon-kotlin.version>4.6.0</axon-kotlin.version>
-    <axon-gateway-extension.version>0.1.1</axon-gateway-extension.version>
+    <axon-gateway-extension.version>1.0.0</axon-gateway-extension.version>
 
     <awaitability.version>4.2.0</awaitability.version>
     <mockito-kotlin.version>4.0.0</mockito-kotlin.version>

bom/taskpool-dependencies/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

core/bus-jackson/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

core/datapool/datapool-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-api</artifactId>

core/datapool/datapool-api/src/main/kotlin/io/holunda/camunda/taskpool/api/business/DataEntryCommands.kt

@@ -28,3 +28,30 @@ data class UpdateDataEntryCommand(
   @TargetAggregateIdentifier
   val dataIdentity: String = dataIdentityString(entryType = dataEntryChange.entryType, entryId = dataEntryChange.entryId)
 )
+
+/**
+ * Command to delete the aggregate.
+ */
+data class DeleteDataEntryCommand(
+  /**
+   * Entry id.
+   */
+  val entryId: EntryId,
+  /**
+   * Entry type.
+   */
+  val entryType: EntryType,
+  /**
+   * Modification information to mark the deletion state.
+   */
+  val modification: Modification = Modification.NONE,
+  /**
+   * Final state.
+   */
+  val state: DataEntryState= ProcessingType.UNDEFINED.of(""),
+  /**
+   * Addressing information.
+   */
+  @TargetAggregateIdentifier
+  val dataIdentity: String = dataIdentityString(entryType = entryType, entryId = entryId),
+)

core/datapool/datapool-api/src/main/kotlin/io/holunda/camunda/taskpool/api/business/ProcessingType.kt

@@ -23,7 +23,11 @@ enum class ProcessingType {
   /**
    * Undefined status.
    */
-  UNDEFINED;
+  UNDEFINED,
+  /**
+   * Data entry is deleted.
+   */
+  DELETED;
 
   /**
    * Factory method.

core/datapool/datapool-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.4.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>

core/datapool/datapool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/DataPoolCoreConfiguration.kt

@@ -44,7 +44,6 @@ class DataPoolCoreConfiguration {
   @Bean(DATA_ENTRY_REPOSITORY)
   fun firstEventDataEntryAggregateRepository(eventStore: EventStore): EventSourcingRepository<DataEntryAggregate> {
     return FirstEventOnlyEventSourcingRepository.builder(DataEntryAggregate::class.java).eventStore(eventStore).build()
-
   }
 
   /**
@@ -75,5 +74,30 @@ class DataPoolCoreConfiguration {
   @Bean(DATA_ENTRY_CACHE)
   fun dataEntryCache(): Cache = WeakReferenceCache()
 
+  /**
+   * Deletion strategy for lax handling of updates after deletion (default).
+   */
+  @ConditionalOnProperty(
+    name = ["polyflow.core.data-entry.deletion-strategy"],
+    havingValue = "lax",
+    matchIfMissing = true
+  )
+  @Bean
+  fun laxDeletionStrategy(): DeletionStrategy = object : DeletionStrategy {
+    override fun strictMode(): Boolean = false
+  }
+
+  /**
+   * Deletion strategy for strict handling of updates after deletion.
+   */
+  @ConditionalOnProperty(
+    name = ["polyflow.core.data-entry.deletion-strategy"],
+    havingValue = "strict",
+    matchIfMissing = false
+  )
+  @Bean
+  fun strictDeletionStrategy(): DeletionStrategy = object : DeletionStrategy {
+    override fun strictMode(): Boolean = false
+  }
 }
 

core/datapool/datapool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/DeletionStrategy.kt

@@ -0,0 +1,12 @@
+package io.holunda.polyflow.datapool.core
+
+/**
+ * Describes how deleted data entries should be handled.
+ */
+interface DeletionStrategy {
+  /**
+   * If set to true, the update event sent to the aggregate will result in AggregateDeletedException.
+   * If set to false, the update of deleted data entry will undelete it and update the properties.
+   */
+  fun strictMode(): Boolean
+}

core/datapool/datapool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/business/CreateOrUpdateCommandHandler.kt

@@ -3,6 +3,7 @@ package io.holunda.polyflow.datapool.core.business
 import io.holunda.camunda.taskpool.api.business.CreateDataEntryCommand
 import io.holunda.camunda.taskpool.api.business.CreateOrUpdateDataEntryCommand
 import io.holunda.camunda.taskpool.api.business.UpdateDataEntryCommand
+import io.holunda.polyflow.datapool.core.DeletionStrategy
 import io.holunda.polyflow.datapool.ifPresentOrElse
 import mu.KLogging
 import org.axonframework.commandhandling.CommandHandler
@@ -18,7 +19,8 @@ import java.util.*
  */
 @Component
 class CreateOrUpdateCommandHandler(
-  private val eventSourcingRepository: EventSourcingRepository<DataEntryAggregate>
+  private val eventSourcingRepository: EventSourcingRepository<DataEntryAggregate>,
+  private val deletionStrategy: DeletionStrategy
 ) {
 
   companion object: KLogging()
@@ -38,7 +40,8 @@ class CreateOrUpdateCommandHandler(
         logger.trace { "Aggregate found. Updating it passing command $updateCommand" }
         aggregate.invoke {
           it.handle(
-            command = updateCommand
+            command = updateCommand,
+            deletionStrategy = deletionStrategy
           )
         }
       },

core/datapool/datapool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/business/DataEntryAggregate.kt

@@ -2,8 +2,10 @@ package io.holunda.polyflow.datapool.core.business
 
 import io.holunda.camunda.taskpool.api.business.*
 import io.holunda.polyflow.datapool.core.DataPoolCoreConfiguration
+import io.holunda.polyflow.datapool.core.DeletionStrategy
 import mu.KLogging
 import org.axonframework.commandhandling.CommandHandler
+import org.axonframework.eventsourcing.AggregateDeletedException
 import org.axonframework.eventsourcing.EventSourcingHandler
 import org.axonframework.modelling.command.AggregateIdentifier
 import org.axonframework.modelling.command.AggregateLifecycle
@@ -21,10 +23,11 @@ import org.axonframework.spring.stereotype.Aggregate
 )
 class DataEntryAggregate() {
 
-  companion object: KLogging()
+  companion object : KLogging()
 
   @AggregateIdentifier
   private lateinit var dataIdentity: String
+  private var deleted: Boolean = false
 
   /**
    * Handle creation of data entry aggregate.
@@ -37,40 +40,80 @@ class DataEntryAggregate() {
   }
 
   /**
-   * Handle update command.
+   * Handle update.
    */
   @CommandHandler
-  fun handle(command: UpdateDataEntryCommand) {
+  fun handle(command: UpdateDataEntryCommand, deletionStrategy: DeletionStrategy) {
+    if (deletionStrategy.strictMode()) {
+      if (deleted) {
+        throw AggregateDeletedException(this.dataIdentity, "The data entry has already been deleted")
+      }
+    }
     AggregateLifecycle.apply(
       command.updatedEvent()
     )
   }
 
   /**
-   * React on create event.
+   * Handle delete.
+   */
+  @CommandHandler
+  fun handle(command: DeleteDataEntryCommand, deletionStrategy: DeletionStrategy) {
+    if (deletionStrategy.strictMode()) {
+      if (deleted) {
+        throw AggregateDeletedException(this.dataIdentity, "The data entry has already been deleted")
+      }
+    }
+    AggregateLifecycle.apply(
+      command.deletedEvent()
+    )
+  }
+
+  /**
+   * React on created event.
    */
   @EventSourcingHandler
   fun on(event: DataEntryCreatedEvent) {
-    val identity = dataIdentityString(entryType = event.entryType, entryId = event.entryId)
+    this.dataIdentity = dataIdentityString(entryType = event.entryType, entryId = event.entryId)
+    if (this.deleted) {
+      this.deleted = false
+    }
     if (logger.isDebugEnabled) {
-      logger.debug { "Created $identity." }
+      logger.debug { "Created $dataIdentity." }
     }
     if (logger.isTraceEnabled) {
-      logger.trace { "Created $identity with: $event" }
+      logger.trace { "Created $dataIdentity with: $event" }
     }
-    this.dataIdentity = identity
   }
 
   /**
-   * React on update event.
+   * React on updated event.
    */
   @EventSourcingHandler
   fun on(event: DataEntryUpdatedEvent) {
+    if (this.deleted) {
+      this.deleted = false
+    }
     if (logger.isDebugEnabled) {
       logger.debug { "Updated $dataIdentity." }
     }
     if (logger.isTraceEnabled) {
       logger.trace { "Updated $dataIdentity with: $event" }
     }
   }
+
+  /**
+   * React on deleted event.
+   */
+  @EventSourcingHandler
+  fun on(event: DataEntryDeletedEvent) {
+    if (logger.isDebugEnabled) {
+      logger.debug { "Deleted $dataIdentity." }
+    }
+    if (logger.isTraceEnabled) {
+      logger.trace { "Deleted $dataIdentity with: $event" }
+    }
+    // Don't use AggregateLifecycle.markDeleted() because then the combination of entryType / entryId is then really deleted forever
+    this.deleted = true
+  }
 }