Refactor data models and improve code quality across microservices

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 = "")
+data class CallmeEvent(val id: Int, val message: String)

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 = "")
+data class CallmeResponse(val id: Int, val message: String)

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
     }
 }

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)
 }

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)
+data class CallmeRequest(val id: Int, val message: String)

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 = "")
+data class CallmeResponse(val id: Int, val message: String)

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)

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 = "")
+data class CallmeRequest(val id: Int, val message: String)

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)
+                  val age: Int)