Format code

wpanas · wpanas · commit 782acbe4c002 · 2024-09-15T15:22:03.000+02:00
diff --git a/kafka/src/main/kotlin/com/github/wpanas/spring/kafka/KafkaApplication.kt b/kafka/src/main/kotlin/com/github/wpanas/spring/kafka/KafkaApplication.kt
@@ -31,7 +31,9 @@ fun main(args: Array<String>) {
 
 @RestController
 @RequestMapping("/order")
-class OrderController(private val orderService: OrderService) {
+class OrderController(
+    private val orderService: OrderService,
+) {
     @PostMapping
     fun placeOrder(
         @RequestBody orderDto: CreateOrderDto,
@@ -44,21 +46,25 @@ class OrderController(private val orderService: OrderService) {
     fun checkOrder(
         @PathVariable("id") id: UUID,
     ): ResponseEntity<ShowOrderDto> =
-        orderService.findOne(id)
+        orderService
+            .findOne(id)
             ?.let(Order::toDto)
             .let { Optional.ofNullable(it) }
             .let { ResponseEntity.of(it) }
 
     @GetMapping
     fun listOrders(): List<ShowOrderDto> =
-        orderService.findAll()
+        orderService
+            .findAll()
             .map(Order::toDto)
 }
 
 fun Order.toDto() = ShowOrderDto(id, coffee, isDone)
 
 @Service
-class OrderService(private val scheduler: OrderProcessingScheduler) {
+class OrderService(
+    private val scheduler: OrderProcessingScheduler,
+) {
     private val orders: ConcurrentMap<UUID, Order> = ConcurrentHashMap()
 
     fun placeOrder(orderDetails: OrderDetails): Order {
@@ -83,7 +89,9 @@ class OrderService(private val scheduler: OrderProcessingScheduler) {
 }
 
 @Component
-class OrderProcessor(private val orderService: OrderService) : MessageListener<String, OrderDetails> {
+class OrderProcessor(
+    private val orderService: OrderService,
+) : MessageListener<String, OrderDetails> {
     @KafkaListener(
         topics = [TOPIC],
         groupId = "\${order-processor.group-id}",
@@ -100,9 +108,12 @@ class OrderProcessor(private val orderService: OrderService) : MessageListener<S
 }
 
 @Component
-class OrderProcessingScheduler(private val kafkaTemplate: KafkaTemplate<String, OrderDetails>) {
+class OrderProcessingScheduler(
+    private val kafkaTemplate: KafkaTemplate<String, OrderDetails>,
+) {
     fun scheduleProcessing(order: Order) {
-        kafkaTemplate.send(TOPIC, order.id.toString(), OrderDetails(order.coffee))
+        kafkaTemplate
+            .send(TOPIC, order.id.toString(), OrderDetails(order.coffee))
             .addCallback(
                 {
                     logger.info("Scheduled order ${order.id}")
@@ -118,10 +129,22 @@ class OrderProcessingScheduler(private val kafkaTemplate: KafkaTemplate<String,
     }
 }
 
-data class OrderDetails(val coffee: String)
-
-data class Order(val id: UUID, val coffee: String, val isDone: Boolean)
-
-data class CreateOrderDto(val coffee: String)
-
-data class ShowOrderDto(val id: UUID, val coffee: String, val isDone: Boolean)
+data class OrderDetails(
+    val coffee: String,
+)
+
+data class Order(
+    val id: UUID,
+    val coffee: String,
+    val isDone: Boolean,
+)
+
+data class CreateOrderDto(
+    val coffee: String,
+)
+
+data class ShowOrderDto(
+    val id: UUID,
+    val coffee: String,
+    val isDone: Boolean,
+)
diff --git a/kafka/src/main/kotlin/com/github/wpanas/spring/kafka/KafkaConfig.kt b/kafka/src/main/kotlin/com/github/wpanas/spring/kafka/KafkaConfig.kt
@@ -10,8 +10,8 @@ const val TOPIC = "com.github.wpanas.orders"
 @Configuration
 class KafkaConfig {
     @Bean
-    fun topic(): NewTopic {
-        return TopicBuilder.name(TOPIC)
+    fun topic(): NewTopic =
+        TopicBuilder
+            .name(TOPIC)
             .build()
-    }
 }
diff --git a/kafka/src/test/kotlin/com/github/wpanas/spring/kafka/KafkaInitializer.kt b/kafka/src/test/kotlin/com/github/wpanas/spring/kafka/KafkaInitializer.kt
@@ -19,8 +19,7 @@ class KafkaInitializer : ApplicationContextInitializer<ConfigurableApplicationCo
 
         mapOf(
             "spring.kafka.bootstrapServers" to kafkaContainer.bootstrapServers,
-        )
-            .let(TestPropertyValues::of)
+        ).let(TestPropertyValues::of)
             .applyTo(applicationContext)
     }
 }
diff --git a/kafka/src/test/kotlin/com/github/wpanas/spring/kafka/OrderControllerTest.kt b/kafka/src/test/kotlin/com/github/wpanas/spring/kafka/OrderControllerTest.kt
@@ -43,20 +43,19 @@ internal class OrderControllerTest {
     @Test
     internal fun `should be able to place order`() {
         val order =
-            mockMvc.post("/order") {
-                content =
-                    """{"coffee": "Espresso"}"""
-                contentType = MediaType.APPLICATION_JSON
-                accept = MediaType.APPLICATION_JSON
-            }
-                .andDo { print() }
+            mockMvc
+                .post("/order") {
+                    content =
+                        """{"coffee": "Espresso"}"""
+                    contentType = MediaType.APPLICATION_JSON
+                    accept = MediaType.APPLICATION_JSON
+                }.andDo { print() }
                 .andExpect {
                     status { isOk() }
                     jsonPath("$.coffee", `is`("Espresso"))
                     jsonPath("$.id", `is`(not(emptyString())))
                     jsonPath("$.isDone", `is`(false))
-                }
-                .toOrder()
+                }.toOrder()
 
         await untilCallTo { orderService.findOne(order.id) } has {
             isDone
@@ -67,11 +66,11 @@ internal class OrderControllerTest {
     internal fun `should check order details`() {
         val order = orderService.placeOrder(OrderDetails("Latte"))
 
-        mockMvc.get("/order/${order.id}") {
-            contentType = MediaType.APPLICATION_JSON
-            accept = MediaType.APPLICATION_JSON
-        }
-            .andDo { print() }
+        mockMvc
+            .get("/order/${order.id}") {
+                contentType = MediaType.APPLICATION_JSON
+                accept = MediaType.APPLICATION_JSON
+            }.andDo { print() }
             .andExpect {
                 status { isOk() }
                 jsonPath("$.coffee", `is`(order.coffee))
@@ -85,11 +84,11 @@ internal class OrderControllerTest {
         val firstOrder = orderService.placeOrder(OrderDetails("Latte")).toDto()
         val secondOrder = orderService.placeOrder(OrderDetails("Espresso")).toDto()
 
-        mockMvc.get("/order") {
-            contentType = MediaType.APPLICATION_JSON
-            accept = MediaType.APPLICATION_JSON
-        }
-            .andDo { print() }
+        mockMvc
+            .get("/order") {
+                contentType = MediaType.APPLICATION_JSON
+                accept = MediaType.APPLICATION_JSON
+            }.andDo { print() }
             .andExpect {
                 status { isOk() }
                 jsonPath("$[*].coffee", containsInAnyOrder(firstOrder.coffee, secondOrder.coffee))
diff --git a/local-db/src/main/kotlin/com/github/wpanas/spring/local/Application.kt b/local-db/src/main/kotlin/com/github/wpanas/spring/local/Application.kt
@@ -30,11 +30,16 @@ data class Cat(
     val name: String,
 )
 
-data class CreateCatDto(val name: String) {
+data class CreateCatDto(
+    val name: String,
+) {
     fun toCat() = Cat(id = null, name = name)
 }
 
-data class ShowCatDto(val id: Long, val name: String)
+data class ShowCatDto(
+    val id: Long,
+    val name: String,
+)
 
 fun Cat.toDto() = ShowCatDto(id!!, name)
 
@@ -43,10 +48,13 @@ interface CatRepository : PagingAndSortingRepository<Cat, Long>
 
 @RestController
 @RequestMapping("/cats")
-class CatController(private val catRepository: CatRepository) {
+class CatController(
+    private val catRepository: CatRepository,
+) {
     @GetMapping
     fun findAll(pageable: Pageable): Page<ShowCatDto> =
-        catRepository.findAll(pageable)
+        catRepository
+            .findAll(pageable)
             .map(Cat::toDto)
 
     @PostMapping
diff --git a/local-db/src/test/kotlin/com/github/wpanas/spring/local/CatControllerTest.kt b/local-db/src/test/kotlin/com/github/wpanas/spring/local/CatControllerTest.kt
@@ -29,13 +29,13 @@ internal class CatControllerTest {
 
     @Test
     internal fun `should add new cat`() {
-        mockMvc.post("/cats") {
-            content =
-                """{"name": "Sherry"}"""
-            contentType = APPLICATION_JSON
-            accept = APPLICATION_JSON
-        }
-            .andDo { print() }
+        mockMvc
+            .post("/cats") {
+                content =
+                    """{"name": "Sherry"}"""
+                contentType = APPLICATION_JSON
+                accept = APPLICATION_JSON
+            }.andDo { print() }
             .andExpect {
                 status { isOk() }
                 jsonPath("$.name", `is`("Sherry"))
@@ -47,10 +47,10 @@ internal class CatControllerTest {
         val benny = catRepository.save(Cat(id = null, name = "Benny"))
         val linda = catRepository.save(Cat(id = null, name = "Linda"))
 
-        mockMvc.get("/cats") {
-            accept = APPLICATION_JSON
-        }
-            .andDo { print() }
+        mockMvc
+            .get("/cats") {
+                accept = APPLICATION_JSON
+            }.andDo { print() }
             .andExpect {
                 status { isOk() }
                 jsonPath("$.totalElements", `is`(2))
diff --git a/local-db/src/test/kotlin/com/github/wpanas/spring/local/PostgreSQLInitializer.kt b/local-db/src/test/kotlin/com/github/wpanas/spring/local/PostgreSQLInitializer.kt
@@ -21,8 +21,7 @@ class PostgreSQLInitializer : ApplicationContextInitializer<ConfigurableApplicat
             "spring.datasource.url" to postgreSQLContainer.jdbcUrl,
             "spring.datasource.username" to postgreSQLContainer.username,
             "spring.datasource.password" to postgreSQLContainer.password,
-        )
-            .let(TestPropertyValues::of)
+        ).let(TestPropertyValues::of)
             .applyTo(applicationContext)
     }
 }
diff --git a/spring-junit5/src/main/kotlin/com/github/wpanas/spring/junit/JunitApplication.kt b/spring-junit5/src/main/kotlin/com/github/wpanas/spring/junit/JunitApplication.kt
@@ -31,11 +31,16 @@ data class Cat(
     val name: String,
 )
 
-data class CreateCatDto(val name: String) {
+data class CreateCatDto(
+    val name: String,
+) {
     fun toCat() = Cat(id = null, name = name)
 }
 
-data class ShowCatDto(val id: Long, val name: String)
+data class ShowCatDto(
+    val id: Long,
+    val name: String,
+)
 
 fun Cat.toDto() = ShowCatDto(id!!, name)
 
@@ -44,10 +49,13 @@ interface CatRepository : PagingAndSortingRepository<Cat, Long>
 
 @RestController
 @RequestMapping("/cats")
-class CatController(private val catRepository: CatRepository) {
+class CatController(
+    private val catRepository: CatRepository,
+) {
     @GetMapping
     fun findAll(pageable: Pageable): Page<ShowCatDto> =
-        catRepository.findAll(pageable)
+        catRepository
+            .findAll(pageable)
             .map(Cat::toDto)
 
     @PostMapping
diff --git a/spring-junit5/src/test/kotlin/com/github/wpanas/spring/junit/CatControllerTest.kt b/spring-junit5/src/test/kotlin/com/github/wpanas/spring/junit/CatControllerTest.kt
@@ -39,12 +39,11 @@ internal class CatControllerTest {
         val postgreSQLContainer =
             PostgreSQLContainer(
                 DockerImageName.parse("postgres:12.4"),
-            )
-                .apply {
-                    withLogConsumer(Slf4jLogConsumer(logger))
-                    withDatabaseName("cats_shelter")
-                    withClasspathResourceMapping("init.sql", CONTAINER_PATH, READ_ONLY)
-                }
+            ).apply {
+                withLogConsumer(Slf4jLogConsumer(logger))
+                withDatabaseName("cats_shelter")
+                withClasspathResourceMapping("init.sql", CONTAINER_PATH, READ_ONLY)
+            }
 
         @JvmStatic
         @DynamicPropertySource
@@ -69,19 +68,18 @@ internal class CatControllerTest {
     @Test
     internal fun `should add new cat`() {
         val cat =
-            mockMvc.post("/cats") {
-                content =
-                    """{"name": "Sherry"}"""
-                contentType = APPLICATION_JSON
-                accept = APPLICATION_JSON
-            }
-                .andDo { print() }
+            mockMvc
+                .post("/cats") {
+                    content =
+                        """{"name": "Sherry"}"""
+                    contentType = APPLICATION_JSON
+                    accept = APPLICATION_JSON
+                }.andDo { print() }
                 .andExpect {
                     status { isOk() }
                     jsonPath("$.name", `is`("Sherry"))
                     jsonPath("$.id", `is`(notNullValue()))
-                }
-                .toCat()
+                }.toCat()
 
         val foundCat = catRepository.findByIdOrNull(cat.id!!)
         assertEquals(foundCat, cat)
@@ -92,10 +90,10 @@ internal class CatControllerTest {
         val benny = catRepository.save(Cat(id = null, name = "Benny"))
         val linda = catRepository.save(Cat(id = null, name = "Linda"))
 
-        mockMvc.get("/cats") {
-            accept = APPLICATION_JSON
-        }
-            .andDo { print() }
+        mockMvc
+            .get("/cats") {
+                accept = APPLICATION_JSON
+            }.andDo { print() }
             .andExpect {
                 status { isOk() }
                 jsonPath("$.totalElements", `is`(2))
diff --git a/spring-kotest/src/main/kotlin/com/github/wpanas/spring/kotest/KotestApplication.kt b/spring-kotest/src/main/kotlin/com/github/wpanas/spring/kotest/KotestApplication.kt
@@ -31,11 +31,16 @@ data class Cat(
     val name: String,
 )
 
-data class CreateCatDto(val name: String) {
+data class CreateCatDto(
+    val name: String,
+) {
     fun toCat() = Cat(id = null, name = name)
 }
 
-data class ShowCatDto(val id: Long, val name: String)
+data class ShowCatDto(
+    val id: Long,
+    val name: String,
+)
 
 fun Cat.toDto() = ShowCatDto(id!!, name)
 
@@ -44,10 +49,13 @@ interface CatRepository : PagingAndSortingRepository<Cat, Long>
 
 @RestController
 @RequestMapping("/cats")
-class CatController(private val catRepository: CatRepository) {
+class CatController(
+    private val catRepository: CatRepository,
+) {
     @GetMapping
     fun findAll(pageable: Pageable): Page<ShowCatDto> =
-        catRepository.findAll(pageable)
+        catRepository
+            .findAll(pageable)
             .map(Cat::toDto)
 
     @PostMapping
diff --git a/spring-kotest/src/test/kotlin/com/github/wpanas/spring/kotest/CatControllerTest.kt b/spring-kotest/src/test/kotlin/com/github/wpanas/spring/kotest/CatControllerTest.kt
diff --git a/spring-kotest/src/test/kotlin/com/github/wpanas/spring/kotest/fixtures/PostgreSQLTestContainer.kt b/spring-kotest/src/test/kotlin/com/github/wpanas/spring/kotest/fixtures/PostgreSQLTestContainer.kt
diff --git a/spring6-junit5/src/main/kotlin/com/github/wpanas/spring/junit/JunitApplication.kt b/spring6-junit5/src/main/kotlin/com/github/wpanas/spring/junit/JunitApplication.kt
diff --git a/spring6-junit5/src/test/kotlin/com/github/wpanas/spring/junit/CatControllerTest.kt b/spring6-junit5/src/test/kotlin/com/github/wpanas/spring/junit/CatControllerTest.kt
diff --git a/spring6-junit5/src/test/kotlin/com/github/wpanas/spring/junit/LocalApplication.kt b/spring6-junit5/src/test/kotlin/com/github/wpanas/spring/junit/LocalApplication.kt

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ class KafkaInitializer : ApplicationContextInitializer<ConfigurableApplicationCo`
`19`	`19`
`20`	`20`	`mapOf(`
`21`	`21`	`"spring.kafka.bootstrapServers" to kafkaContainer.bootstrapServers,`
`22`		`- )`
`23`		`- .let(TestPropertyValues::of)`
	`22`	`+ ).let(TestPropertyValues::of)`
`24`	`23`	`.applyTo(applicationContext)`
`25`	`24`	`}`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ class PostgreSQLInitializer : ApplicationContextInitializer<ConfigurableApplicat`
`21`	`21`	`"spring.datasource.url" to postgreSQLContainer.jdbcUrl,`
`22`	`22`	`"spring.datasource.username" to postgreSQLContainer.username,`
`23`	`23`	`"spring.datasource.password" to postgreSQLContainer.password,`
`24`		`- )`
`25`		`- .let(TestPropertyValues::of)`
	`24`	`+ ).let(TestPropertyValues::of)`
`26`	`25`	`.applyTo(applicationContext)`
`27`	`26`	`}`
`28`	`27`	`}`