diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml index b1279ee4b..7ba8eb260 100644 --- a/bom/datapool-dependencies/pom.xml +++ b/bom/datapool-dependencies/pom.xml @@ -6,7 +6,7 @@ camunda-bpm-taskpool io.holunda.taskpool - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml index e0c319dee..bcdd3ce7e 100644 --- a/bom/taskpool-dependencies/pom.xml +++ b/bom/taskpool-dependencies/pom.xml @@ -6,7 +6,7 @@ camunda-bpm-taskpool io.holunda.taskpool - 2.1.5 + 2.1.6 ../../pom.xml @@ -30,7 +30,7 @@ io.holunda.taskpool camunda-bpm-taskpool-collector - 2.1.5 + 2.1.6 io.holunda.taskpool diff --git a/datapool/datapool-api/pom.xml b/datapool/datapool-api/pom.xml index 3ba30240d..852db55f9 100755 --- a/datapool/datapool-api/pom.xml +++ b/datapool/datapool-api/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-datapool-root - 2.1.5 + 2.1.6 camunda-bpm-datapool-api diff --git a/datapool/datapool-core/pom.xml b/datapool/datapool-core/pom.xml index b215b030e..3d4743182 100755 --- a/datapool/datapool-core/pom.xml +++ b/datapool/datapool-core/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-datapool-root - 2.1.5 + 2.1.6 camunda-bpm-datapool-core diff --git a/datapool/datapool-event/pom.xml b/datapool/datapool-event/pom.xml index 260c884f2..319ecb1d7 100755 --- a/datapool/datapool-event/pom.xml +++ b/datapool/datapool-event/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-datapool-root - 2.1.5 + 2.1.6 camunda-bpm-datapool-event diff --git a/datapool/pom.xml b/datapool/pom.xml index b7b786595..02222d9ef 100755 --- a/datapool/pom.xml +++ b/datapool/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 camunda-bpm-datapool-root diff --git a/docs/pom.xml b/docs/pom.xml index 229efcf77..3d7bc00a9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 camunda-bpm-taskpool-docs diff --git a/docs/src/orchid/resources/changelog/2.1/2.1.6.ad b/docs/src/orchid/resources/changelog/2.1/2.1.6.ad new file mode 100644 index 000000000..8795870bd --- /dev/null +++ b/docs/src/orchid/resources/changelog/2.1/2.1.6.ad @@ -0,0 +1,8 @@ +--- +version: 2.1.6 +--- + +== Feature + +* Fix Mongo connection problems, see #307 +* Provide current DB scripts for examples diff --git a/engine/camunda-engine-client/pom.xml b/engine/camunda-engine-client/pom.xml index eb71e28c1..76b38d48b 100644 --- a/engine/camunda-engine-client/pom.xml +++ b/engine/camunda-engine-client/pom.xml @@ -4,7 +4,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 camunda-bpm-engine-client diff --git a/engine/datapool-collector/pom.xml b/engine/datapool-collector/pom.xml index 2d76b702d..e38d4f64d 100755 --- a/engine/datapool-collector/pom.xml +++ b/engine/datapool-collector/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 camunda-bpm-datapool-collector diff --git a/engine/pom.xml b/engine/pom.xml index 03225b799..1506763a9 100755 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 camunda-bpm-taskpool-engine-root diff --git a/engine/property-taskurl-resolver/pom.xml b/engine/property-taskurl-resolver/pom.xml index c12c48dc1..667a0c563 100644 --- a/engine/property-taskurl-resolver/pom.xml +++ b/engine/property-taskurl-resolver/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 taskpool-property-taskurl-resolver diff --git a/engine/taskpool-collector/pom.xml b/engine/taskpool-collector/pom.xml index 678961d11..007b6e720 100755 --- a/engine/taskpool-collector/pom.xml +++ b/engine/taskpool-collector/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-collector diff --git a/engine/taskpool-engine-springboot-starter/pom.xml b/engine/taskpool-engine-springboot-starter/pom.xml index a129d980e..748d92981 100755 --- a/engine/taskpool-engine-springboot-starter/pom.xml +++ b/engine/taskpool-engine-springboot-starter/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-engine-springboot-starter diff --git a/engine/variable-serializer/pom.xml b/engine/variable-serializer/pom.xml index 9ea658fa2..73542e28a 100755 --- a/engine/variable-serializer/pom.xml +++ b/engine/variable-serializer/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-engine-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-variable-serializer diff --git a/examples/components/process-backend/pom.xml b/examples/components/process-backend/pom.xml index da4a9e189..9b5c626ca 100755 --- a/examples/components/process-backend/pom.xml +++ b/examples/components/process-backend/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/process-forms/pom.xml b/examples/components/process-forms/pom.xml index 8c7cd2ea0..dc4a490a7 100755 --- a/examples/components/process-forms/pom.xml +++ b/examples/components/process-forms/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/tasklist-angular/pom.xml b/examples/components/tasklist-angular/pom.xml index d73307aa8..956794d91 100755 --- a/examples/components/tasklist-angular/pom.xml +++ b/examples/components/tasklist-angular/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/tasklist-api/pom.xml b/examples/components/tasklist-api/pom.xml index c931f4f76..9b9f51977 100755 --- a/examples/components/tasklist-api/pom.xml +++ b/examples/components/tasklist-api/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/tasklist-backend/pom.xml b/examples/components/tasklist-backend/pom.xml index 30deadafd..a4db8be7d 100755 --- a/examples/components/tasklist-backend/pom.xml +++ b/examples/components/tasklist-backend/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/tasklist-reactive-backend/pom.xml b/examples/components/tasklist-reactive-backend/pom.xml index 3e0b16f2f..98da1e822 100755 --- a/examples/components/tasklist-reactive-backend/pom.xml +++ b/examples/components/tasklist-reactive-backend/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/components/users/pom.xml b/examples/components/users/pom.xml index 7b8222c65..11919a578 100644 --- a/examples/components/users/pom.xml +++ b/examples/components/users/pom.xml @@ -7,7 +7,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 ../../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 5afda3b7e..242f00eaf 100755 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 taskpool-examples-root diff --git a/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml b/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml index 4735ac340..48205adb7 100755 --- 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 @@ io.holunda.taskpool taskpool-example-scenario-distributed-axon-server - 2.1.5 + 2.1.6 example-distributed-axon-server-webapp-application diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml index 6bbd2985c..bcd8a8fae 100755 --- 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 @@ io.holunda.taskpool taskpool-example-cockpit-root - 2.1.5 + 2.1.6 taskpool-example-cockpit diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml index d91a8dafd..08489427a 100755 --- 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 @@ io.holunda.taskpool taskpool-example-cockpit-root - 2.1.5 + 2.1.6 taskpool-example-cockpit-backend diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml index b79ecf02f..00d59e830 100755 --- 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 @@ io.holunda.taskpool taskpool-example-cockpit-root - 2.1.5 + 2.1.6 taskpool-example-cockpit-frontend diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml index c45c5d993..2b086705d 100755 --- a/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml +++ b/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-example-scenario-distributed-axon-server - 2.1.5 + 2.1.6 taskpool-example-cockpit-root diff --git a/examples/scenarios/distributed-axon-server/pom.xml b/examples/scenarios/distributed-axon-server/pom.xml index ea28431df..93ac6b226 100755 --- a/examples/scenarios/distributed-axon-server/pom.xml +++ b/examples/scenarios/distributed-axon-server/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-example-scenario-root - 2.1.5 + 2.1.6 taskpool-example-scenario-distributed-axon-server diff --git a/examples/scenarios/distributed-axon-server/process-application/pom.xml b/examples/scenarios/distributed-axon-server/process-application/pom.xml index dc74403d1..42fbb84f5 100755 --- a/examples/scenarios/distributed-axon-server/process-application/pom.xml +++ b/examples/scenarios/distributed-axon-server/process-application/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-example-scenario-distributed-axon-server - 2.1.5 + 2.1.6 example-distributed-axon-server-process-application diff --git a/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.13.0.sql b/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.14.0.sql similarity index 98% rename from examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.13.0.sql rename to examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.14.0.sql index 42f6c3fc1..c21c0b3ab 100644 --- a/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.13.0.sql +++ b/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_1__postgres_engine_7.14.0.sql @@ -40,6 +40,12 @@ values ('history.cleanup.job.lock', '0', 1); insert into ACT_GE_PROPERTY values ('startup.lock', '0', 1); +insert into ACT_GE_PROPERTY +values ('telemetry.lock', '0', 1); + +insert into ACT_GE_PROPERTY +values ('installationId.lock', '0', 1); + create table ACT_GE_BYTEARRAY ( ID_ varchar(64), REV_ integer, @@ -63,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG ( ); insert into ACT_GE_SCHEMA_LOG -values ('0', CURRENT_TIMESTAMP, '7.13.0'); +values ('0', CURRENT_TIMESTAMP, '7.14.0'); create table ACT_RE_DEPLOYMENT ( ID_ varchar(64), @@ -210,6 +216,7 @@ create table ACT_RU_VARIABLE ( CASE_EXECUTION_ID_ varchar(64), CASE_INST_ID_ varchar(64), TASK_ID_ varchar(64), + BATCH_ID_ varchar(64), BYTEARRAY_ID_ varchar(64), DOUBLE_ double precision, LONG_ bigint, @@ -334,13 +341,17 @@ create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_); +create index ACT_IDX_TASK_OWNER on ACT_RU_TASK(OWNER_); create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_); + create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_); +create index ACT_IDX_VARIABLE_TASK_NAME_TYPE on ACT_RU_VARIABLE(TASK_ID_, NAME_, TYPE_); + create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_); create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_); -- CAM-5914 @@ -528,6 +539,12 @@ alter table ACT_RU_EXT_TASK foreign key (ERROR_DETAILS_ID_) references ACT_GE_BYTEARRAY (ID_); +create index ACT_IDX_BATCH_ID ON ACT_RU_VARIABLE(BATCH_ID_); +alter table ACT_RU_VARIABLE + add constraint ACT_FK_VAR_BATCH + foreign key (BATCH_ID_) + references ACT_RU_BATCH (ID_); + -- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 -- create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_); create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_); @@ -804,7 +821,7 @@ create table ACT_HI_ACTINST ( CALL_CASE_INST_ID_ varchar(64), ACT_NAME_ varchar(255), ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), + ASSIGNEE_ varchar(255), START_TIME_ timestamp not null, END_TIME_ timestamp, DURATION_ bigint, @@ -1147,6 +1164,8 @@ create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_); create index ACT_IDX_HI_INCIDENT_ROOT_PI on ACT_HI_INCIDENT(ROOT_PROC_INST_ID_); create index ACT_IDX_HI_INCIDENT_PROCINST on ACT_HI_INCIDENT(PROC_INST_ID_); create index ACT_IDX_HI_INCIDENT_RM_TIME on ACT_HI_INCIDENT(REMOVAL_TIME_); +create index ACT_IDX_HI_INCIDENT_CREATE_TIME on ACT_HI_INCIDENT(CREATE_TIME_); +create index ACT_IDX_HI_INCIDENT_END_TIME on ACT_HI_INCIDENT(END_TIME_); create index ACT_IDX_HI_JOB_LOG_ROOT_PI on ACT_HI_JOB_LOG(ROOT_PROC_INST_ID_); create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_); diff --git a/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_2__postgres_identity_7.13.0.sql b/examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_2__postgres_identity_7.14.0.sql similarity index 100% rename from examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_2__postgres_identity_7.13.0.sql rename to examples/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_2__postgres_identity_7.14.0.sql diff --git a/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml b/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml index 9df2900ab..0a09948b2 100755 --- a/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml +++ b/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-example-scenario-distributed-axon-server - 2.1.5 + 2.1.6 example-distributed-axon-server-taskpool-application diff --git a/examples/scenarios/pom.xml b/examples/scenarios/pom.xml index 88ec23526..cbe44973b 100755 --- a/examples/scenarios/pom.xml +++ b/examples/scenarios/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-examples-root - 2.1.5 + 2.1.6 taskpool-example-scenario-root diff --git a/examples/scenarios/single-node/pom.xml b/examples/scenarios/single-node/pom.xml index 546cc1ce2..a089e105c 100755 --- a/examples/scenarios/single-node/pom.xml +++ b/examples/scenarios/single-node/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool taskpool-example-scenario-root - 2.1.5 + 2.1.6 taskpool-example-scenario-single-node diff --git a/pom.xml b/pom.xml index fc7bb4e78..6677b24db 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 pom ${project.artifactId} diff --git a/taskpool/pom.xml b/taskpool/pom.xml index 7a1ea7f24..3753cec7c 100755 --- a/taskpool/pom.xml +++ b/taskpool/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 camunda-bpm-taskpool-root diff --git a/taskpool/taskpool-api/pom.xml b/taskpool/taskpool-api/pom.xml index ec3572dc7..191ba50ff 100755 --- a/taskpool/taskpool-api/pom.xml +++ b/taskpool/taskpool-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-api diff --git a/taskpool/taskpool-core/pom.xml b/taskpool/taskpool-core/pom.xml index eae897469..d0dffa37a 100755 --- a/taskpool/taskpool-core/pom.xml +++ b/taskpool/taskpool-core/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-core diff --git a/taskpool/taskpool-event/pom.xml b/taskpool/taskpool-event/pom.xml index 69b82245c..fbf2282dc 100755 --- a/taskpool/taskpool-event/pom.xml +++ b/taskpool/taskpool-event/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-event diff --git a/view/mongo/pom.xml b/view/mongo/pom.xml index 582f0b495..5784f1edb 100755 --- a/view/mongo/pom.xml +++ b/view/mongo/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-view-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-view-mongo diff --git a/view/mongo/src/main/kotlin/io/holunda/camunda/taskpool/view/mongo/TaskPoolMongoViewConfiguration.kt b/view/mongo/src/main/kotlin/io/holunda/camunda/taskpool/view/mongo/TaskPoolMongoViewConfiguration.kt index 773b57d68..d8c1b345c 100644 --- a/view/mongo/src/main/kotlin/io/holunda/camunda/taskpool/view/mongo/TaskPoolMongoViewConfiguration.kt +++ b/view/mongo/src/main/kotlin/io/holunda/camunda/taskpool/view/mongo/TaskPoolMongoViewConfiguration.kt @@ -1,28 +1,20 @@ package io.holunda.camunda.taskpool.view.mongo -import com.mongodb.client.MongoClient -import io.holunda.camunda.taskpool.view.mongo.repository.CaseReferenceDocument -import io.holunda.camunda.taskpool.view.mongo.repository.ProcessReferenceDocument -import io.holunda.camunda.taskpool.view.mongo.repository.ReferenceDocument +import io.holunda.camunda.taskpool.view.mongo.repository.TaskDocument import mu.KLogging import org.axonframework.eventhandling.tokenstore.TokenStore import org.axonframework.extensions.mongo.DefaultMongoTemplate import org.axonframework.extensions.mongo.MongoTemplate import org.axonframework.extensions.mongo.eventsourcing.tokenstore.MongoTokenStore import org.axonframework.serialization.xml.XStreamSerializer -import org.springframework.beans.factory.annotation.Value +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration -import org.springframework.data.convert.ConfigurableTypeInformationMapper import org.springframework.data.mongodb.MongoDatabaseFactory -import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration -import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper -import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper.DEFAULT_TYPE_KEY import org.springframework.data.mongodb.core.convert.MappingMongoConverter -import org.springframework.data.mongodb.core.convert.MongoCustomConversions -import org.springframework.data.mongodb.core.mapping.MongoMappingContext import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories import javax.annotation.PostConstruct @@ -31,23 +23,21 @@ import javax.annotation.PostConstruct @ComponentScan @EnableReactiveMongoRepositories @EnableConfigurationProperties(TaskPoolMongoViewProperties::class) -class TaskPoolMongoViewConfiguration : AbstractMongoClientConfiguration() { +@EntityScan(basePackageClasses = [TaskDocument::class]) +class TaskPoolMongoViewConfiguration { companion object : KLogging() - @Value("\${spring.data.mongodb.database:tasks-control}") - lateinit var mongoDatabaseName: String - @PostConstruct fun info() { - logger.info { "VIEW-MONGO-001: Initialized mongo view to use database '$mongoDatabaseName'" } + logger.info { "VIEW-MONGO-001: Initialized mongo view" } } @Bean - fun configureAxonMongoTemplate(): MongoTemplate = + fun configureAxonMongoTemplate(databaseFactory: MongoDatabaseFactory): MongoTemplate = DefaultMongoTemplate .builder() - .mongoDatabase(mongoClient(), mongoDatabaseName) + .mongoDatabase(databaseFactory.mongoDatabase) .trackingTokensCollectionName("tracking-tokens") // these collections are configured, but not used on the client side. .domainEventsCollectionName("domain-events") @@ -63,24 +53,9 @@ class TaskPoolMongoViewConfiguration : AbstractMongoClientConfiguration() { .serializer(XStreamSerializer.builder().build()) .build() - @Bean - override fun mappingMongoConverter(mongoDatabaseFactory: MongoDatabaseFactory, customConversions: MongoCustomConversions, mappingContext: MongoMappingContext): MappingMongoConverter { - val mmc = super.mappingMongoConverter(mongoDatabaseFactory, customConversions, mappingContext) - mmc.apply { - this.typeMapper = DefaultMongoTypeMapper(DEFAULT_TYPE_KEY, listOf( - // register type aliases for source references. - ConfigurableTypeInformationMapper( - mapOf( - ProcessReferenceDocument::class.java to ReferenceDocument.PROCESS, - CaseReferenceDocument::class.java to ReferenceDocument.CASE - ) - ) - )) - // replace "." with ":" (relevant for correlation) - this.setMapKeyDotReplacement(":") - } - return mmc + @Autowired + fun configureMongoTypeMapping(converter: MappingMongoConverter) { + // replace "." with ":" (relevant for correlation) + converter.setMapKeyDotReplacement(":") } - - override fun getDatabaseName(): String = this.mongoDatabaseName } diff --git a/view/pom.xml b/view/pom.xml index ba1c0f713..531955bcc 100755 --- a/view/pom.xml +++ b/view/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool - 2.1.5 + 2.1.6 camunda-bpm-taskpool-view-root diff --git a/view/simple/pom.xml b/view/simple/pom.xml index 7f2ae61ca..8b7600df6 100755 --- a/view/simple/pom.xml +++ b/view/simple/pom.xml @@ -5,7 +5,7 @@ io.holunda.taskpool camunda-bpm-taskpool-view-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-view-simple diff --git a/view/view-api/pom.xml b/view/view-api/pom.xml index e1985d797..cb1eb50c1 100755 --- a/view/view-api/pom.xml +++ b/view/view-api/pom.xml @@ -6,7 +6,7 @@ io.holunda.taskpool camunda-bpm-taskpool-view-root - 2.1.5 + 2.1.6 camunda-bpm-taskpool-view-api