From 4e4c81e00a29cc1b741fd5e69e4e888b9101589a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:00:01 +0000 Subject: [PATCH 1/2] Bump polyflow.version from 4.2.2 to 4.4.0 Bumps `polyflow.version` from 4.2.2 to 4.4.0. Updates `io.holunda.polyflow:polyflow-taskpool-dependencies` from 4.2.2 to 4.4.0 Updates `io.holunda.polyflow:polyflow-view-api-client` from 4.2.2 to 4.4.0 --- updated-dependencies: - dependency-name: io.holunda.polyflow:polyflow-taskpool-dependencies dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.holunda.polyflow:polyflow-view-api-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d0e4017..60a512db 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 3.4.4 - 4.2.2 + 4.4.0 7.21.0 7.21.0-ee From 8e261822566d2a1739bfe809433518dae84432bd Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Thu, 5 Jun 2025 15:03:04 +0200 Subject: [PATCH 2/2] fix mu.KLogging dependency --- .../approval/RequestApprovalProcessConfiguration.kt | 6 +++--- .../approval/adapter/rest/impl/AmendRequestResource.kt | 6 +++--- .../approval/adapter/rest/impl/ApproveRequestResource.kt | 6 +++--- .../approval/adapter/rest/impl/AssignmentResource.kt | 6 +++--- .../approval/adapter/rest/impl/RequestResource.kt | 7 +++---- .../adapter/workflow/listener/LoggingTaskListener.kt | 6 +++--- .../process/approval/schedule/PrefillingConfiguration.kt | 6 ++++-- .../process/approval/schedule/ScheduledConfiguration.kt | 6 +++--- .../process/approval/service/SystemInfoPrinter.kt | 9 ++++----- .../example/tasklist/adapter/rest/impl/TaskResource.kt | 6 ++++-- .../tasklist/adapter/rest/impl/TaskServiceGateway.kt | 6 +++--- .../example/tasklist/adapter/rest/impl/TaskResourceIT.kt | 4 ++-- .../tasklist/rest/impl/ReactiveTasksController.kt | 6 +++--- .../io/holunda/polyflow/example/other/OtherAggregate.kt | 6 ++++-- .../cockpit/rest/impl/CockpitTaskOperationController.kt | 6 +++--- .../taskpool/cockpit/rest/impl/CockpitTasksController.kt | 6 +++--- .../taskpool/cockpit/service/TaskPoolCockpitService.kt | 6 ++++-- .../polyflow/serializer/gdpr/MyMessageInterceptor.kt | 6 +++--- 18 files changed, 58 insertions(+), 52 deletions(-) diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/RequestApprovalProcessConfiguration.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/RequestApprovalProcessConfiguration.kt index d2b19137..bb8e5964 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/RequestApprovalProcessConfiguration.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/RequestApprovalProcessConfiguration.kt @@ -15,7 +15,7 @@ import io.holunda.polyflow.taskpool.EnableTaskpoolEngineSupport import io.holunda.polyflow.taskpool.collector.task.enricher.* import io.holunda.polyflow.taskpool.sender.gateway.CommandErrorHandler import io.holunda.polyflow.taskpool.sender.gateway.LoggingTaskCommandErrorHandler -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.commandhandling.CommandResultMessage import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication import org.springframework.boot.autoconfigure.domain.EntityScan @@ -25,6 +25,8 @@ import org.springframework.context.annotation.Import import org.springframework.context.annotation.Primary import org.springframework.data.jpa.repository.config.EnableJpaRepositories +private val logger = KotlinLogging.logger {} + @Configuration @EnableProcessApplication @EnableTaskpoolEngineSupport @@ -38,8 +40,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories ) class RequestApprovalProcessConfiguration { - companion object : KLogging() - @Bean fun processVariablesFilter(): ProcessVariablesFilter = ProcessVariablesFilter( // define a variable filter for every task inside the process diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AmendRequestResource.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AmendRequestResource.kt index e4a1a657..6c31f0cf 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AmendRequestResource.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AmendRequestResource.kt @@ -8,19 +8,19 @@ import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAmend import io.holunda.polyflow.example.process.approval.adapter.rest.request import io.holunda.polyflow.example.process.approval.adapter.rest.taskDto import io.holunda.polyflow.view.auth.UserService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.http.ResponseEntity import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional +private val logger = KotlinLogging.logger {} + @Component class AmendRequestResource( private val requestApprovalProcessBean: RequestApprovalProcessBean, private val userService: UserService ) : UserTaskAmendRequestApiDelegate { - companion object : KLogging() - override fun loadTaskAmendRequestFormData( id: String, xCurrentUserID: String diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/ApproveRequestResource.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/ApproveRequestResource.kt index 32b3b539..fa6675be 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/ApproveRequestResource.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/ApproveRequestResource.kt @@ -7,19 +7,19 @@ import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAppro import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskApproveRequestSubmitDataDto import io.holunda.polyflow.example.process.approval.adapter.rest.taskDto import io.holunda.polyflow.view.auth.UserService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.http.ResponseEntity import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional +private val logger = KotlinLogging.logger {} + @Component class ApproveRequestResource( private val requestApprovalProcessBean: RequestApprovalProcessBean, private val userService: UserService ) : UserTaskApproveRequestApiDelegate { - companion object : KLogging() - override fun loadTaskApproveRequestFormData( id: String, xCurrentUserID: String diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AssignmentResource.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AssignmentResource.kt index 3c6a7450..e3a11ea7 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AssignmentResource.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AssignmentResource.kt @@ -4,7 +4,7 @@ import io.holunda.polyflow.example.process.approval.process.AssignmentCommand import io.holunda.polyflow.example.process.approval.process.RequestApprovalProcessBean import io.holunda.polyflow.example.process.approval.adapter.rest.api.UserTaskAssignmentApiDelegate import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAssignmentDto -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.commandhandling.CommandMessage import org.axonframework.commandhandling.CommandResultMessage import org.axonframework.commandhandling.gateway.CommandGateway @@ -12,14 +12,14 @@ import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity.noContent import org.springframework.stereotype.Component +private val logger = KotlinLogging.logger {} + @Component class AssignmentResource( private val requestApprovalProcessBean: RequestApprovalProcessBean, private val commandGateway: CommandGateway ) : UserTaskAssignmentApiDelegate { - companion object : KLogging() - override fun submitTaskAssignmentChange( taskId: String, xCurrentUserID: String, diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/RequestResource.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/RequestResource.kt index 813ed748..98906e06 100755 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/RequestResource.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/RequestResource.kt @@ -16,7 +16,7 @@ import io.holunda.polyflow.view.auth.User import io.holunda.polyflow.view.auth.UserService import io.holunda.polyflow.view.query.data.DataEntriesForUserQuery import io.holunda.polyflow.view.query.data.DataEntriesQueryResult -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.messaging.GenericMessage import org.axonframework.queryhandling.QueryGateway import org.springframework.http.ResponseEntity @@ -24,6 +24,8 @@ import org.springframework.http.ResponseEntity.noContent import org.springframework.http.ResponseEntity.ok import org.springframework.stereotype.Component +private val logger = KotlinLogging.logger {} + @Component class RequestResource( private val requestApprovalProcessBean: RequestApprovalProcessBean, @@ -33,9 +35,6 @@ class RequestResource( private val objectMapper: ObjectMapper ) : RequestApiDelegate { - companion object : KLogging() - - override fun startNewApproval( xCurrentUserID: String, approvalRequestDraftDto: ApprovalRequestDraftDto, diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/workflow/listener/LoggingTaskListener.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/workflow/listener/LoggingTaskListener.kt index a4cf84af..e75529c0 100755 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/workflow/listener/LoggingTaskListener.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/workflow/listener/LoggingTaskListener.kt @@ -1,17 +1,17 @@ package io.holunda.polyflow.example.process.approval.adapter.workflow.listener import io.holunda.polyflow.taskpool.collector.task.TaskEventCollectorService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.camunda.bpm.engine.delegate.DelegateTask import org.springframework.context.event.EventListener import org.springframework.core.annotation.Order import org.springframework.stereotype.Component +private val logger = KotlinLogging.logger {} + @Component class LoggingTaskListener { - companion object : KLogging() - @EventListener(condition = "#task.eventName.equals('create')") @Order(TaskEventCollectorService.ORDER - 9) fun logTaskCreation(task: DelegateTask) { diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/PrefillingConfiguration.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/PrefillingConfiguration.kt index e8daa2a7..151ded46 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/PrefillingConfiguration.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/PrefillingConfiguration.kt @@ -3,11 +3,13 @@ package io.holunda.polyflow.example.process.approval.schedule import io.holunda.polyflow.example.process.approval.process.RequestApprovalProcessBean import io.holunda.polyflow.example.process.approval.service.RequestService import io.holunda.polyflow.example.process.approval.service.BusinessDataEntry -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.camunda.bpm.spring.boot.starter.event.PostDeployEvent import org.springframework.context.event.EventListener import org.springframework.stereotype.Component +private val logger = KotlinLogging.logger {} + /** * This configuration makes sure that some processes are started directly * after empty system initialization to demonstrate how the system looks like @@ -19,7 +21,7 @@ class PrefillingConfiguration( private val requestService: RequestService ) { - companion object : KLogging() { + companion object { const val MIN_INSTANCES = 1L } diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/ScheduledConfiguration.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/ScheduledConfiguration.kt index 87925e8c..f7e5f420 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/ScheduledConfiguration.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/ScheduledConfiguration.kt @@ -4,7 +4,7 @@ import io.holunda.polyflow.example.process.approval.process.RequestApprovalProce import io.holunda.polyflow.example.process.approval.service.RequestService import io.holunda.polyflow.example.process.approval.service.BusinessDataEntry import io.holunda.polyflow.example.users.UserStoreService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Profile @@ -19,6 +19,8 @@ import java.util.concurrent.atomic.AtomicLong @Profile("scheduled-processes") class ScheduledConfiguration +private val logger = KotlinLogging.logger {} + @Component class ScheduledStarter( private val processApprovalProcessBean: RequestApprovalProcessBean, @@ -26,8 +28,6 @@ class ScheduledStarter( private val userStoreService: UserStoreService ) { - companion object : KLogging() - @Value("\${scheduled-processes.limit:1000}") private var limit: Long = 999 private lateinit var requestInfo: Pair diff --git a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/service/SystemInfoPrinter.kt b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/service/SystemInfoPrinter.kt index 449ddb8d..06172b6d 100644 --- a/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/service/SystemInfoPrinter.kt +++ b/components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/service/SystemInfoPrinter.kt @@ -1,17 +1,18 @@ package io.holunda.polyflow.example.process.approval.service +import io.github.oshai.kotlinlogging.KotlinLogging import io.holixon.axon.gateway.query.QueryResponseMessageResponseType import io.holunda.polyflow.example.users.UserStoreService import io.holunda.polyflow.view.ProcessInstanceState import io.holunda.polyflow.view.query.process.ProcessInstanceQueryResult import io.holunda.polyflow.view.query.process.ProcessInstancesByStateQuery -import mu.KLogging import org.axonframework.queryhandling.QueryGateway import org.springframework.boot.ApplicationRunner import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +private val logger = KotlinLogging.logger {} @Configuration class SystemInfoPrinter( @@ -20,16 +21,14 @@ class SystemInfoPrinter( private val queryGateway: QueryGateway ) { - companion object : KLogging() - @Bean fun requestPrinter(): ApplicationRunner { return ApplicationRunner { try { val requests = requestService.getAllRequests(1) - logger.info("Found ${requests.size} requests.") + logger.info { "Found ${requests.size} requests." } requests.forEach { - logger.info("Request $it") + logger.info { "Request $it" } } } catch (e: Exception) { logger.error(e) { "Error loading requests" } diff --git a/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt b/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt index ba4157e6..b57ef3c4 100644 --- a/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt +++ b/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt @@ -8,7 +8,7 @@ import io.holunda.polyflow.example.tasklist.adapter.rest.model.TaskWithDataEntri import io.holunda.polyflow.view.Task import io.holunda.polyflow.view.auth.User import io.holunda.polyflow.view.auth.UserService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.camunda.bpm.engine.variable.Variables import org.springframework.http.HttpHeaders import org.springframework.http.ResponseEntity @@ -16,6 +16,8 @@ import org.springframework.stereotype.Component import java.time.OffsetDateTime import java.util.* +private val logger = KotlinLogging.logger {} + @Component class TaskResource( private val taskServiceGateway: TaskServiceGateway, @@ -23,7 +25,7 @@ class TaskResource( private val mapper: TaskWithDataEntriesMapper ) : TaskApiDelegate { - companion object : KLogging() { + companion object { const val HEADER_ELEMENT_COUNT = "X-ElementCount" } diff --git a/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskServiceGateway.kt b/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskServiceGateway.kt index 755aaae3..9539356b 100644 --- a/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskServiceGateway.kt +++ b/components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskServiceGateway.kt @@ -8,19 +8,19 @@ import io.holunda.polyflow.view.auth.User import io.holunda.polyflow.view.query.task.TaskForIdQuery import io.holunda.polyflow.view.query.task.TasksWithDataEntriesForUserQuery import io.holunda.polyflow.view.query.task.TasksWithDataEntriesQueryResult -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.commandhandling.gateway.CommandGateway import org.axonframework.queryhandling.QueryGateway import org.springframework.stereotype.Component +private val logger = KotlinLogging.logger {} + @Component class TaskServiceGateway( queryGateway: QueryGateway, val commandGateway: CommandGateway ) { - companion object : KLogging() - val taskQueryClient = TaskQueryClient(queryGateway) fun send(command: InteractionTaskCommand) { diff --git a/components/tasklist-backend/src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt b/components/tasklist-backend/src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt index 751d46c5..a733a036 100644 --- a/components/tasklist-backend/src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt +++ b/components/tasklist-backend/src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt @@ -13,9 +13,9 @@ import org.mockito.kotlin.whenever import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.http.MediaType import org.springframework.test.context.ActiveProfiles +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -33,7 +33,7 @@ internal class TaskResourceIT { @Autowired private lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean private lateinit var taskServiceGateway: TaskServiceGateway @Autowired diff --git a/components/tasklist-reactive-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/rest/impl/ReactiveTasksController.kt b/components/tasklist-reactive-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/rest/impl/ReactiveTasksController.kt index ca84393f..6c18b1c0 100644 --- a/components/tasklist-reactive-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/rest/impl/ReactiveTasksController.kt +++ b/components/tasklist-reactive-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/rest/impl/ReactiveTasksController.kt @@ -8,7 +8,7 @@ import io.holunda.polyflow.view.TaskWithDataEntries import io.holunda.polyflow.view.auth.UserService import io.holunda.polyflow.view.query.task.TasksWithDataEntriesForUserQuery import io.holunda.polyflow.view.query.task.TasksWithDataEntriesQueryResult -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.messaging.responsetypes.ResponseTypes import org.axonframework.queryhandling.QueryGateway import org.axonframework.queryhandling.SubscriptionQueryResult @@ -19,6 +19,8 @@ import java.util.* import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern +private val logger = KotlinLogging.logger {} + /** * Reactive controller delivering tasks. */ @@ -31,8 +33,6 @@ class ReactiveTasksController( private val mapper: TaskWithDataEntriesMapper ) { - companion object : KLogging() - @GetMapping(path = ["/tasks"], produces = [MediaType.TEXT_EVENT_STREAM_VALUE, MediaType.APPLICATION_JSON_VALUE]) fun getTasks( @NotNull @Pattern(regexp = "^([\\w]*)=([.]+)?$") @RequestParam(value = "filter", required = true, defaultValue = "[]") filters: List, diff --git a/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/kotlin/io/holunda/polyflow/example/other/OtherAggregate.kt b/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/kotlin/io/holunda/polyflow/example/other/OtherAggregate.kt index 83e589ff..94c3c060 100644 --- a/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/kotlin/io/holunda/polyflow/example/other/OtherAggregate.kt +++ b/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/kotlin/io/holunda/polyflow/example/other/OtherAggregate.kt @@ -1,19 +1,21 @@ package io.holunda.polyflow.example.other -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.commandhandling.CommandHandler import org.axonframework.eventsourcing.EventSourcingHandler import org.axonframework.modelling.command.AggregateIdentifier import org.axonframework.modelling.command.AggregateLifecycle import org.axonframework.spring.stereotype.Aggregate +private val logger = KotlinLogging.logger {} + @Aggregate class OtherAggregate { @AggregateIdentifier private lateinit var id: String - companion object: KLogging() { + companion object { @JvmStatic @CommandHandler fun create(cmd: OtherAggregateCreateCommand) = OtherAggregate().apply { diff --git a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTaskOperationController.kt b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTaskOperationController.kt index 0174ce25..a9a5365b 100644 --- a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTaskOperationController.kt +++ b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTaskOperationController.kt @@ -3,7 +3,7 @@ package io.holunda.camunda.taskpool.cockpit.rest.impl import io.holunda.camunda.taskpool.api.task.DeleteTaskCommand import io.holunda.camunda.taskpool.cockpit.rest.Rest import io.holunda.camunda.taskpool.cockpit.service.TaskPoolCockpitService -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.commandhandling.gateway.CommandGateway import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController import reactor.core.publisher.Mono +private val logger = KotlinLogging.logger {} + /** * Task operation controller. */ @@ -21,8 +23,6 @@ class CockpitTaskOperationController( private val cockpitService: TaskPoolCockpitService ) { - companion object : KLogging() - /** * Send a command for a specific task. */ diff --git a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTasksController.kt b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTasksController.kt index 3e471c24..937f969e 100644 --- a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTasksController.kt +++ b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/rest/impl/CockpitTasksController.kt @@ -5,7 +5,7 @@ import io.holunda.camunda.taskpool.cockpit.rest.mapper.TaskEventMapper import io.holunda.camunda.taskpool.cockpit.rest.model.TaskEventDto import io.holunda.camunda.taskpool.cockpit.service.QueryTaskEvents import io.holunda.camunda.taskpool.cockpit.service.TaskEventWithMetaData -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.messaging.responsetypes.ResponseTypes import org.axonframework.queryhandling.QueryGateway import org.axonframework.queryhandling.SubscriptionQueryResult @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController import reactor.core.publisher.Flux +private val logger = KotlinLogging.logger {} + /** * Task event controller. */ @@ -25,8 +27,6 @@ class CockpitTasksController( private val mapper: TaskEventMapper ) { - companion object : KLogging() - /** * Retrieves all task events. */ diff --git a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/service/TaskPoolCockpitService.kt b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/service/TaskPoolCockpitService.kt index dc81ee2f..cfe01145 100644 --- a/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/service/TaskPoolCockpitService.kt +++ b/scenarios/distributed-axon-server/cockpit-application/backend/src/main/kotlin/io/holunda/camunda/taskpool/cockpit/service/TaskPoolCockpitService.kt @@ -3,7 +3,7 @@ package io.holunda.camunda.taskpool.cockpit.service import io.holunda.camunda.taskpool.api.task.SourceReference import io.holunda.camunda.taskpool.api.task.TaskEvent import io.holunda.camunda.taskpool.cockpit.service.TaskPoolCockpitService.Companion.PROCESSING_GROUP -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.config.EventProcessingConfiguration import org.axonframework.config.ProcessingGroup import org.axonframework.eventhandling.EventHandler @@ -15,6 +15,8 @@ import org.axonframework.queryhandling.QueryUpdateEmitter import org.springframework.stereotype.Component import java.time.Instant +private val logger = KotlinLogging.logger {} + /** * Service collecting the events. */ @@ -26,7 +28,7 @@ class TaskPoolCockpitService( private val queryUpdateEmitter: QueryUpdateEmitter ) { - companion object : KLogging() { + companion object { const val PROCESSING_GROUP = "io.holunda.camunda.taskpool.cockpit.service" } diff --git a/scenarios/single-node-jpa/src/main/kotlin/io/holunda/polyflow/serializer/gdpr/MyMessageInterceptor.kt b/scenarios/single-node-jpa/src/main/kotlin/io/holunda/polyflow/serializer/gdpr/MyMessageInterceptor.kt index 12d46599..0c9c1f8d 100644 --- a/scenarios/single-node-jpa/src/main/kotlin/io/holunda/polyflow/serializer/gdpr/MyMessageInterceptor.kt +++ b/scenarios/single-node-jpa/src/main/kotlin/io/holunda/polyflow/serializer/gdpr/MyMessageInterceptor.kt @@ -1,13 +1,13 @@ package io.holunda.polyflow.serializer.gdpr -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.axonframework.eventhandling.EventMessage import org.axonframework.messaging.MessageDispatchInterceptor import java.util.function.BiFunction -class MYMessageInterceptor : MessageDispatchInterceptor> { +private val logger = KotlinLogging.logger {} - companion object: KLogging() +class MYMessageInterceptor : MessageDispatchInterceptor> { override fun handle(messages: MutableList>): BiFunction, EventMessage> { return BiFunction { index, event -> event.apply {