Merge branch 'release/2.1.4'

holunda-io · Mar 23, 2021 · 7a97915 · 7a97915
2 parents ed8b1b6 + d900c7e
commit 7a97915
Show file tree

Hide file tree

Showing 45 changed files with 76 additions and 60 deletions.
diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>camunda-bpm-taskpool</artifactId>
     <groupId>io.holunda.taskpool</groupId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>camunda-bpm-taskpool</artifactId>
     <groupId>io.holunda.taskpool</groupId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>io.holunda.taskpool</groupId>
         <artifactId>camunda-bpm-taskpool-collector</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.4</version>
       </dependency>
       <dependency>
         <groupId>io.holunda.taskpool</groupId>

diff --git a/datapool/datapool-api/pom.xml b/datapool/datapool-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-api</artifactId>

diff --git a/datapool/datapool-core/pom.xml b/datapool/datapool-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-core</artifactId>

diff --git a/datapool/datapool-event/pom.xml b/datapool/datapool-event/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-datapool-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-event</artifactId>

diff --git a/datapool/pom.xml b/datapool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-root</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-docs</artifactId>

diff --git a/docs/src/orchid/resources/changelog/2.1/2.1.4.ad b/docs/src/orchid/resources/changelog/2.1/2.1.4.ad
@@ -0,0 +1,7 @@
+---
+version: 2.1.4
+---
+
+== Bugfixes
+
+* Fixed implementation of the task collector data serialization, #303
diff --git a/engine/camunda-engine-client/pom.xml b/engine/camunda-engine-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-engine-client</artifactId>

diff --git a/engine/datapool-collector/pom.xml b/engine/datapool-collector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-datapool-collector</artifactId>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-engine-root</artifactId>

diff --git a/engine/property-taskurl-resolver/pom.xml b/engine/property-taskurl-resolver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>taskpool-property-taskurl-resolver</artifactId>

diff --git a/engine/taskpool-collector/pom.xml b/engine/taskpool-collector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-collector</artifactId>

diff --git a/...ain/kotlin/io/holunda/camunda/taskpool/sender/accumulator/ProjectingCommandAccumulator.kt b/...ain/kotlin/io/holunda/camunda/taskpool/sender/accumulator/ProjectingCommandAccumulator.kt
@@ -1,15 +1,17 @@
 package io.holunda.camunda.taskpool.sender.accumulator
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.holunda.camunda.taskpool.api.business.WithCorrelations
 import io.holunda.camunda.taskpool.api.task.*
+import io.holunda.camunda.taskpool.configureTaskpoolJacksonObjectMapper
 import io.holunda.camunda.variable.serializer.serialize
 import kotlin.reflect.KClass
 
 
 /**
  * Sorts commands by their order id and project attribute to one command
- * @param objectMapper optional object mapper used for serialization, defaults to jacksonObjectMapper with Kotlin module.
+ * @param objectMapper optional object mapper used for serialization.
  */
 class ProjectingCommandAccumulator(
   val objectMapper: ObjectMapper
@@ -74,7 +76,9 @@ class ProjectingCommandAccumulator(
       WithPayload::payload.name,
       WithCorrelations::correlations.name
     ),
-    projectionErrorDetector = EngineTaskCommandProjectionErrorDetector
+    projectionErrorDetector = EngineTaskCommandProjectionErrorDetector,
+    mapper = jacksonMapper(objectMapper = objectMapper),
+    unmapper = jacksonUnmapper(clazz = command::class.java, objectMapper = objectMapper)
   )
 
   /**

diff --git a/...ector/src/main/kotlin/io/holunda/camunda/taskpool/sender/accumulator/projectProperties.kt b/...ector/src/main/kotlin/io/holunda/camunda/taskpool/sender/accumulator/projectProperties.kt
@@ -1,6 +1,7 @@
 package io.holunda.camunda.taskpool.sender.accumulator
 
 import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.holunda.camunda.taskpool.configureTaskpoolJacksonObjectMapper
 import org.slf4j.LoggerFactory
@@ -38,8 +39,8 @@ fun <T : Any> projectProperties(
   original: T,
   details: List<Any> = emptyList(),
   propertyOperationConfig: PropertyOperationConfiguration = mapOf(),
-  mapper: Mapper<T> = jacksonMapper(),
-  unmapper: Unmapper<T> = jacksonUnmapper(original::class.java),
+  mapper: Mapper<T>,
+  unmapper: Unmapper<T>,
   ignoredProperties: List<String> = emptyList(),
   projectionErrorDetector: ProjectionErrorDetector
 ): T {
@@ -100,18 +101,19 @@ fun <T : Any> projectProperties(
 /**
  * Default Jackson Mapper (object to map).
  */
-fun <T> jacksonMapper(): Mapper<T> = {
-  jacksonObjectMapper()
+fun <T> jacksonMapper(objectMapper: ObjectMapper = jacksonObjectMapper()): Mapper<T> = {
+  objectMapper
     .configureTaskpoolJacksonObjectMapper()
     .convertValue(it, object : TypeReference<MutableMap<String, Any?>>() {})
 }
 
 /**
  * Default Jackson Unmapper (map to object).
  */
-fun <T> jacksonUnmapper(clazz: Class<T>): Unmapper<T> = {
-  jacksonObjectMapper()
-    .configureTaskpoolJacksonObjectMapper().convertValue(it, clazz)
+fun <T> jacksonUnmapper(clazz: Class<T>, objectMapper: ObjectMapper = jacksonObjectMapper()): Unmapper<T> = {
+  objectMapper
+    .configureTaskpoolJacksonObjectMapper()
+    .convertValue(it, clazz)
 }
 
 /**

diff --git a/...ool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/projectPropertiesTest.kt b/...ool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/projectPropertiesTest.kt
@@ -2,21 +2,23 @@
 
 package io.holunda.camunda.taskpool.sender
 
-import io.holunda.camunda.taskpool.sender.accumulator.ProjectionErrorDetector
-import io.holunda.camunda.taskpool.sender.accumulator.PropertyOperation
-import io.holunda.camunda.taskpool.sender.accumulator.projectProperties
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import io.holunda.camunda.taskpool.configureTaskpoolJacksonObjectMapper
+import io.holunda.camunda.taskpool.sender.accumulator.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.*
 import kotlin.reflect.KClass
 
 class PropertiesProjectorTest {
 
+  private val objectMapper = jacksonObjectMapper().configureTaskpoolJacksonObjectMapper()
+
   @Test
   fun `should return the command if details are empty`() {
 
     val model = model("Foo", "My foo model")
-    val result = projectProperties(model, projectionErrorDetector = object:ProjectionErrorDetector{})
+    val result = projectProperties(model, projectionErrorDetector = object:ProjectionErrorDetector{}, mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper))
 
     assertThat(result).isEqualTo(model)
   }
@@ -25,7 +27,7 @@ class PropertiesProjectorTest {
   fun `should replace a detail`() {
 
     val model = model("Foo", "My foo model")
-    val result = projectProperties(model, listOf(named(name = "new name", id = model.id)), projectionErrorDetector = object:ProjectionErrorDetector{})
+    val result = projectProperties(model, listOf(named(name = "new name", id = model.id)), projectionErrorDetector = object:ProjectionErrorDetector{}, mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper))
 
     assertThat(result).isEqualTo(model.copy(name = "new name"))
   }
@@ -37,7 +39,8 @@ class PropertiesProjectorTest {
     val result = projectProperties(model, listOf(
       named(name = "wrong name", id = model.id),
       named(name = "new name", id = model.id)),
-      projectionErrorDetector = object:ProjectionErrorDetector{}
+      projectionErrorDetector = object:ProjectionErrorDetector{},
+      mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper)
     )
 
     assertThat(result).isEqualTo(model.copy(name = "new name"))
@@ -50,7 +53,7 @@ class PropertiesProjectorTest {
     val result = projectProperties(model, listOf(
       payload(payload = mutableMapOf("zee" to "test"), id = model.id),
       named(name = "new name", id = model.id)),
-      projectionErrorDetector = object:ProjectionErrorDetector{}
+      projectionErrorDetector = object:ProjectionErrorDetector{}, mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper)
     )
 
     assertThat(result).isEqualTo(model.copy(name = "new name", enriched = true, payload = mutableMapOf("zee" to "test")))
@@ -73,7 +76,7 @@ class PropertiesProjectorTest {
           }
         }
       ),
-      projectionErrorDetector = object:ProjectionErrorDetector{}
+      projectionErrorDetector = object:ProjectionErrorDetector{}, mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper)
     )
 
     assertThat(result).isEqualTo(model.copy(name = "new name", enriched = true, payload = mutableMapOf("foo" to "bar", "zee" to "test")))
@@ -103,7 +106,7 @@ class PropertiesProjectorTest {
           }
         }
       ),
-      projectionErrorDetector = object:ProjectionErrorDetector{}
+      projectionErrorDetector = object:ProjectionErrorDetector{}, mapper = jacksonMapper(objectMapper), unmapper = jacksonUnmapper(model::class.java, objectMapper)
     )
 
     // map elements should vanish, kermit remains alone in the list

diff --git a/engine/taskpool-engine-springboot-starter/pom.xml b/engine/taskpool-engine-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-engine-springboot-starter</artifactId>

diff --git a/engine/variable-serializer/pom.xml b/engine/variable-serializer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool-engine-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>camunda-bpm-taskpool-variable-serializer</artifactId>

diff --git a/examples/components/process-backend/pom.xml b/examples/components/process-backend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/process-forms/pom.xml b/examples/components/process-forms/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-angular/pom.xml b/examples/components/tasklist-angular/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-api/pom.xml b/examples/components/tasklist-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-backend/pom.xml b/examples/components/tasklist-backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/tasklist-reactive-backend/pom.xml b/examples/components/tasklist-reactive-backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/components/users/pom.xml b/examples/components/users/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-examples-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>camunda-bpm-taskpool</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>taskpool-examples-root</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml b/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>example-distributed-axon-server-webapp-application</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-cockpit-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>taskpool-example-cockpit</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-cockpit-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>taskpool-example-cockpit-backend</artifactId>

diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.taskpool</groupId>
     <artifactId>taskpool-example-cockpit-root</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
   </parent>
 
   <artifactId>taskpool-example-cockpit-frontend</artifactId>