From 2653ee865272eee6cbdffc9a6bb5407705d5fbd7 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:44:18 +0000 Subject: [PATCH] Refactor data models and improve code quality across --- .../cunsumerb/message/CallmeEvent.kt | 2 +- .../cunsumerb/message/CallmeResponse.kt | 2 +- .../caller/client/ResponseTimeInterceptor.kt | 19 +++++++++---------- .../caller/controller/CallerController.kt | 2 +- .../samples/caller/model/CallmeRequest.kt | 2 +- .../samples/caller/model/CallmeResponse.kt | 2 +- .../samples/caller/model/Conversation.kt | 2 +- .../samples/callme/model/CallmeRequest.kt | 2 +- .../pl/piomin/samples/intro/domain/Person.kt | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeEvent.kt b/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeEvent.kt index 8e9fb28..1605cc5 100644 --- a/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeEvent.kt +++ b/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeEvent.kt @@ -1,3 +1,3 @@ package pl.piomin.samples.eventdriven.cunsumerb.message -data class CallmeEvent(val id: Int = 0, val message: String = "") \ No newline at end of file +data class CallmeEvent(val id: Int, val message: String) \ No newline at end of file diff --git a/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeResponse.kt b/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeResponse.kt index bd6024a..ab6c978 100644 --- a/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeResponse.kt +++ b/event-driven/consumer-b-service/src/main/kotlin/pl/piomin/samples/eventdriven/cunsumerb/message/CallmeResponse.kt @@ -1,3 +1,3 @@ package pl.piomin.samples.eventdriven.cunsumerb.message -data class CallmeResponse(val id: Int = 0, val message: String = "") \ No newline at end of file +data class CallmeResponse(val id: Int, val message: String) \ No newline at end of file diff --git a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/client/ResponseTimeInterceptor.kt b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/client/ResponseTimeInterceptor.kt index 1d05115..c2bfd9d 100644 --- a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/client/ResponseTimeInterceptor.kt +++ b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/client/ResponseTimeInterceptor.kt @@ -2,24 +2,23 @@ package pl.piomin.samples.caller.client import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.slf4j.MDC import org.springframework.http.HttpRequest import org.springframework.http.client.ClientHttpRequestExecution import org.springframework.http.client.ClientHttpRequestInterceptor import org.springframework.http.client.ClientHttpResponse -class ResponseTimeInterceptor(private val responseTimeHistory: ResponseTimeHistory) : ClientHttpRequestInterceptor { +class ResponseTimeInterceptor(private val history: ResponseTimeHistory) : ClientHttpRequestInterceptor { private val logger: Logger = LoggerFactory.getLogger(ResponseTimeInterceptor::class.java) - override fun intercept(request: HttpRequest, array: ByteArray, - execution: ClientHttpRequestExecution): ClientHttpResponse { - val startTime: Long = System.currentTimeMillis() - val response: ClientHttpResponse = execution.execute(request, array) // 1 - val endTime: Long = System.currentTimeMillis() - val responseTime: Long = endTime - startTime - logger.info("Response time: instance->{}, time->{}", MDC.get("address"), responseTime) - responseTimeHistory.addNewMeasure(MDC.get("address"), responseTime) // 2 + override fun intercept(request: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution): ClientHttpResponse { + val start = System.currentTimeMillis() + val response = execution.execute(request, body) + val end = System.currentTimeMillis() + val executionTime = end - start + val address = request.uri.host + ":" + request.uri.port + history.addNewMeasure(address, executionTime) + logger.info("Request to {} took {} ms", address, executionTime) return response } } \ No newline at end of file diff --git a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/controller/CallerController.kt b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/controller/CallerController.kt index 48d4044..d1ee99c 100644 --- a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/controller/CallerController.kt +++ b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/controller/CallerController.kt @@ -48,5 +48,5 @@ class CallerController(private val template: RestTemplate, private val factory: @GetMapping("/conversations/{requestId}") fun findByRequestId(@PathVariable requestId: Int): Conversation? = template.getForObject("http://inter-callme-service/callme/conversations/{requestId}", - Conversation::class.java, requestId) + Conversation::class.java, requestId) } \ No newline at end of file diff --git a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeRequest.kt b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeRequest.kt index 4913bf7..accdc8b 100644 --- a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeRequest.kt +++ b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeRequest.kt @@ -1,3 +1,3 @@ package pl.piomin.samples.caller.model -data class CallmeRequest (val id: Int? = null, val message: String? = null) \ No newline at end of file +data class CallmeRequest(val id: Int, val message: String) \ No newline at end of file diff --git a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeResponse.kt b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeResponse.kt index c02c016..8d374fd 100644 --- a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeResponse.kt +++ b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/CallmeResponse.kt @@ -1,3 +1,3 @@ package pl.piomin.samples.caller.model -data class CallmeResponse(var id: Int = 0, val message: String = "") \ No newline at end of file +data class CallmeResponse(val id: Int, val message: String) \ No newline at end of file diff --git a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/Conversation.kt b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/Conversation.kt index 484d09b..4e28bd4 100644 --- a/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/Conversation.kt +++ b/inter-communication/inter-caller-service/src/main/kotlin/pl/piomin/samples/caller/model/Conversation.kt @@ -2,6 +2,6 @@ package pl.piomin.samples.caller.model import java.time.LocalDateTime -class Conversation(val time: LocalDateTime = LocalDateTime.now(), +data class Conversation(val time: LocalDateTime = LocalDateTime.now(), val request: CallmeRequest? = null, val response: CallmeResponse? = null) \ No newline at end of file diff --git a/inter-communication/inter-callme-service/src/main/kotlin/pl/piomin/samples/callme/model/CallmeRequest.kt b/inter-communication/inter-callme-service/src/main/kotlin/pl/piomin/samples/callme/model/CallmeRequest.kt index a2afa5e..c3eb36c 100644 --- a/inter-communication/inter-callme-service/src/main/kotlin/pl/piomin/samples/callme/model/CallmeRequest.kt +++ b/inter-communication/inter-callme-service/src/main/kotlin/pl/piomin/samples/callme/model/CallmeRequest.kt @@ -1,3 +1,3 @@ package pl.piomin.samples.callme.model -data class CallmeRequest (val id: Int = 0, val message: String = "") \ No newline at end of file +data class CallmeRequest(val id: Int, val message: String) \ No newline at end of file diff --git a/intro-to-spring-boot/src/main/kotlin/pl/piomin/samples/intro/domain/Person.kt b/intro-to-spring-boot/src/main/kotlin/pl/piomin/samples/intro/domain/Person.kt index de84d8e..da54503 100644 --- a/intro-to-spring-boot/src/main/kotlin/pl/piomin/samples/intro/domain/Person.kt +++ b/intro-to-spring-boot/src/main/kotlin/pl/piomin/samples/intro/domain/Person.kt @@ -3,4 +3,4 @@ package pl.piomin.samples.intro.domain data class Person(val id: Int, val firstName: String, val lastName: String, - var age: Int) \ No newline at end of file + val age: Int) \ No newline at end of file