Skip to content

Commit 8e26182

Browse files
committed
fix mu.KLogging dependency
1 parent 4e4c81e commit 8e26182

File tree

18 files changed

+58
-52
lines changed

18 files changed

+58
-52
lines changed

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/RequestApprovalProcessConfiguration.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import io.holunda.polyflow.taskpool.EnableTaskpoolEngineSupport
1515
import io.holunda.polyflow.taskpool.collector.task.enricher.*
1616
import io.holunda.polyflow.taskpool.sender.gateway.CommandErrorHandler
1717
import io.holunda.polyflow.taskpool.sender.gateway.LoggingTaskCommandErrorHandler
18-
import mu.KLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import org.axonframework.commandhandling.CommandResultMessage
2020
import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication
2121
import org.springframework.boot.autoconfigure.domain.EntityScan
@@ -25,6 +25,8 @@ import org.springframework.context.annotation.Import
2525
import org.springframework.context.annotation.Primary
2626
import org.springframework.data.jpa.repository.config.EnableJpaRepositories
2727

28+
private val logger = KotlinLogging.logger {}
29+
2830
@Configuration
2931
@EnableProcessApplication
3032
@EnableTaskpoolEngineSupport
@@ -38,8 +40,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories
3840
)
3941
class RequestApprovalProcessConfiguration {
4042

41-
companion object : KLogging()
42-
4343
@Bean
4444
fun processVariablesFilter(): ProcessVariablesFilter = ProcessVariablesFilter(
4545
// define a variable filter for every task inside the process

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AmendRequestResource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAmend
88
import io.holunda.polyflow.example.process.approval.adapter.rest.request
99
import io.holunda.polyflow.example.process.approval.adapter.rest.taskDto
1010
import io.holunda.polyflow.view.auth.UserService
11-
import mu.KLogging
11+
import io.github.oshai.kotlinlogging.KotlinLogging
1212
import org.springframework.http.ResponseEntity
1313
import org.springframework.stereotype.Component
1414
import org.springframework.transaction.annotation.Transactional
1515

16+
private val logger = KotlinLogging.logger {}
17+
1618
@Component
1719
class AmendRequestResource(
1820
private val requestApprovalProcessBean: RequestApprovalProcessBean,
1921
private val userService: UserService
2022
) : UserTaskAmendRequestApiDelegate {
2123

22-
companion object : KLogging()
23-
2424
override fun loadTaskAmendRequestFormData(
2525
id: String,
2626
xCurrentUserID: String

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/ApproveRequestResource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAppro
77
import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskApproveRequestSubmitDataDto
88
import io.holunda.polyflow.example.process.approval.adapter.rest.taskDto
99
import io.holunda.polyflow.view.auth.UserService
10-
import mu.KLogging
10+
import io.github.oshai.kotlinlogging.KotlinLogging
1111
import org.springframework.http.ResponseEntity
1212
import org.springframework.stereotype.Component
1313
import org.springframework.transaction.annotation.Transactional
1414

15+
private val logger = KotlinLogging.logger {}
16+
1517
@Component
1618
class ApproveRequestResource(
1719
private val requestApprovalProcessBean: RequestApprovalProcessBean,
1820
private val userService: UserService
1921
) : UserTaskApproveRequestApiDelegate {
2022

21-
companion object : KLogging()
22-
2323
override fun loadTaskApproveRequestFormData(
2424
id: String,
2525
xCurrentUserID: String

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/AssignmentResource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ import io.holunda.polyflow.example.process.approval.process.AssignmentCommand
44
import io.holunda.polyflow.example.process.approval.process.RequestApprovalProcessBean
55
import io.holunda.polyflow.example.process.approval.adapter.rest.api.UserTaskAssignmentApiDelegate
66
import io.holunda.polyflow.example.process.approval.adapter.rest.model.TaskAssignmentDto
7-
import mu.KLogging
7+
import io.github.oshai.kotlinlogging.KotlinLogging
88
import org.axonframework.commandhandling.CommandMessage
99
import org.axonframework.commandhandling.CommandResultMessage
1010
import org.axonframework.commandhandling.gateway.CommandGateway
1111
import org.springframework.http.ResponseEntity
1212
import org.springframework.http.ResponseEntity.noContent
1313
import org.springframework.stereotype.Component
1414

15+
private val logger = KotlinLogging.logger {}
16+
1517
@Component
1618
class AssignmentResource(
1719
private val requestApprovalProcessBean: RequestApprovalProcessBean,
1820
private val commandGateway: CommandGateway
1921
) : UserTaskAssignmentApiDelegate {
2022

21-
companion object : KLogging()
22-
2323
override fun submitTaskAssignmentChange(
2424
taskId: String,
2525
xCurrentUserID: String,

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/rest/impl/RequestResource.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ import io.holunda.polyflow.view.auth.User
1616
import io.holunda.polyflow.view.auth.UserService
1717
import io.holunda.polyflow.view.query.data.DataEntriesForUserQuery
1818
import io.holunda.polyflow.view.query.data.DataEntriesQueryResult
19-
import mu.KLogging
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import org.axonframework.messaging.GenericMessage
2121
import org.axonframework.queryhandling.QueryGateway
2222
import org.springframework.http.ResponseEntity
2323
import org.springframework.http.ResponseEntity.noContent
2424
import org.springframework.http.ResponseEntity.ok
2525
import org.springframework.stereotype.Component
2626

27+
private val logger = KotlinLogging.logger {}
28+
2729
@Component
2830
class RequestResource(
2931
private val requestApprovalProcessBean: RequestApprovalProcessBean,
@@ -33,9 +35,6 @@ class RequestResource(
3335
private val objectMapper: ObjectMapper
3436
) : RequestApiDelegate {
3537

36-
companion object : KLogging()
37-
38-
3938
override fun startNewApproval(
4039
xCurrentUserID: String,
4140
approvalRequestDraftDto: ApprovalRequestDraftDto,

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/adapter/workflow/listener/LoggingTaskListener.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package io.holunda.polyflow.example.process.approval.adapter.workflow.listener
22

33
import io.holunda.polyflow.taskpool.collector.task.TaskEventCollectorService
4-
import mu.KLogging
4+
import io.github.oshai.kotlinlogging.KotlinLogging
55
import org.camunda.bpm.engine.delegate.DelegateTask
66
import org.springframework.context.event.EventListener
77
import org.springframework.core.annotation.Order
88
import org.springframework.stereotype.Component
99

10+
private val logger = KotlinLogging.logger {}
11+
1012
@Component
1113
class LoggingTaskListener {
1214

13-
companion object : KLogging()
14-
1515
@EventListener(condition = "#task.eventName.equals('create')")
1616
@Order(TaskEventCollectorService.ORDER - 9)
1717
fun logTaskCreation(task: DelegateTask) {

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/PrefillingConfiguration.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package io.holunda.polyflow.example.process.approval.schedule
33
import io.holunda.polyflow.example.process.approval.process.RequestApprovalProcessBean
44
import io.holunda.polyflow.example.process.approval.service.RequestService
55
import io.holunda.polyflow.example.process.approval.service.BusinessDataEntry
6-
import mu.KLogging
6+
import io.github.oshai.kotlinlogging.KotlinLogging
77
import org.camunda.bpm.spring.boot.starter.event.PostDeployEvent
88
import org.springframework.context.event.EventListener
99
import org.springframework.stereotype.Component
1010

11+
private val logger = KotlinLogging.logger {}
12+
1113
/**
1214
* This configuration makes sure that some processes are started directly
1315
* after empty system initialization to demonstrate how the system looks like
@@ -19,7 +21,7 @@ class PrefillingConfiguration(
1921
private val requestService: RequestService
2022
) {
2123

22-
companion object : KLogging() {
24+
companion object {
2325
const val MIN_INSTANCES = 1L
2426
}
2527

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/schedule/ScheduledConfiguration.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.holunda.polyflow.example.process.approval.process.RequestApprovalProce
44
import io.holunda.polyflow.example.process.approval.service.RequestService
55
import io.holunda.polyflow.example.process.approval.service.BusinessDataEntry
66
import io.holunda.polyflow.example.users.UserStoreService
7-
import mu.KLogging
7+
import io.github.oshai.kotlinlogging.KotlinLogging
88
import org.springframework.beans.factory.annotation.Value
99
import org.springframework.context.annotation.Configuration
1010
import org.springframework.context.annotation.Profile
@@ -19,15 +19,15 @@ import java.util.concurrent.atomic.AtomicLong
1919
@Profile("scheduled-processes")
2020
class ScheduledConfiguration
2121

22+
private val logger = KotlinLogging.logger {}
23+
2224
@Component
2325
class ScheduledStarter(
2426
private val processApprovalProcessBean: RequestApprovalProcessBean,
2527
private val requestService: RequestService,
2628
private val userStoreService: UserStoreService
2729
) {
2830

29-
companion object : KLogging()
30-
3131
@Value("\${scheduled-processes.limit:1000}")
3232
private var limit: Long = 999
3333
private lateinit var requestInfo: Pair<String, AtomicLong>

components/approval/backend/src/main/kotlin/io/holunda/polyflow/example/process/approval/service/SystemInfoPrinter.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package io.holunda.polyflow.example.process.approval.service
22

3+
import io.github.oshai.kotlinlogging.KotlinLogging
34
import io.holixon.axon.gateway.query.QueryResponseMessageResponseType
45
import io.holunda.polyflow.example.users.UserStoreService
56
import io.holunda.polyflow.view.ProcessInstanceState
67
import io.holunda.polyflow.view.query.process.ProcessInstanceQueryResult
78
import io.holunda.polyflow.view.query.process.ProcessInstancesByStateQuery
8-
import mu.KLogging
99
import org.axonframework.queryhandling.QueryGateway
1010
import org.springframework.boot.ApplicationRunner
1111
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
1212
import org.springframework.context.annotation.Bean
1313
import org.springframework.context.annotation.Configuration
1414

15+
private val logger = KotlinLogging.logger {}
1516

1617
@Configuration
1718
class SystemInfoPrinter(
@@ -20,16 +21,14 @@ class SystemInfoPrinter(
2021
private val queryGateway: QueryGateway
2122
) {
2223

23-
companion object : KLogging()
24-
2524
@Bean
2625
fun requestPrinter(): ApplicationRunner {
2726
return ApplicationRunner {
2827
try {
2928
val requests = requestService.getAllRequests(1)
30-
logger.info("Found ${requests.size} requests.")
29+
logger.info { "Found ${requests.size} requests." }
3130
requests.forEach {
32-
logger.info("Request $it")
31+
logger.info { "Request $it" }
3332
}
3433
} catch (e: Exception) {
3534
logger.error(e) { "Error loading requests" }

components/tasklist-backend/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@ import io.holunda.polyflow.example.tasklist.adapter.rest.model.TaskWithDataEntri
88
import io.holunda.polyflow.view.Task
99
import io.holunda.polyflow.view.auth.User
1010
import io.holunda.polyflow.view.auth.UserService
11-
import mu.KLogging
11+
import io.github.oshai.kotlinlogging.KotlinLogging
1212
import org.camunda.bpm.engine.variable.Variables
1313
import org.springframework.http.HttpHeaders
1414
import org.springframework.http.ResponseEntity
1515
import org.springframework.stereotype.Component
1616
import java.time.OffsetDateTime
1717
import java.util.*
1818

19+
private val logger = KotlinLogging.logger {}
20+
1921
@Component
2022
class TaskResource(
2123
private val taskServiceGateway: TaskServiceGateway,
2224
private val userService: UserService,
2325
private val mapper: TaskWithDataEntriesMapper
2426
) : TaskApiDelegate {
2527

26-
companion object : KLogging() {
28+
companion object {
2729
const val HEADER_ELEMENT_COUNT = "X-ElementCount"
2830
}
2931

0 commit comments

Comments
 (0)