fix: linting

rluetzner · May 25, 2023 · b48372b · b48372b
1 parent f66d5ce
commit b48372b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     kotlin("plugin.allopen") version kotlinVersion
     kotlin("kapt") version kotlinVersion
     id("com.github.node-gradle.node") version "3.5.1"
-    id("org.jlleitschuh.gradle.ktlint") version "11.3.1"
+    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
 }
 
 configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {

diff --git a/src/main/kotlin/io/github/bayang/jelu/controllers/ReadingEventsController.kt b/src/main/kotlin/io/github/bayang/jelu/controllers/ReadingEventsController.kt
@@ -100,13 +100,22 @@ class ReadingEventsController(
     }
 
     @PutMapping(path = ["/reading-events/{id}"])
-    fun updateReadingEvent(@PathVariable("id") readingEventId: UUID, @RequestBody @Valid readingEvent: UpdateReadingEventDto): ReadingEventDto {
+    fun updateReadingEvent(
+        @PathVariable("id")
+        readingEventId: UUID,
+        @RequestBody
+        @Valid
+        readingEvent: UpdateReadingEventDto
+    ): ReadingEventDto {
         return repository.updateReadingEvent(readingEventId, readingEvent)
     }
 
     @ApiResponse(responseCode = "204", description = "Deleted the reading event")
     @DeleteMapping(path = ["/reading-events/{id}"])
-    fun deleteEventById(@PathVariable("id") eventId: UUID): ResponseEntity<Unit> {
+    fun deleteEventById(
+        @PathVariable("id")
+        eventId: UUID
+    ): ResponseEntity<Unit> {
         repository.deleteReadingEventById(eventId)
         return ResponseEntity.noContent().build()
     }

diff --git a/src/main/kotlin/io/github/bayang/jelu/controllers/UserMessagesController.kt b/src/main/kotlin/io/github/bayang/jelu/controllers/UserMessagesController.kt
@@ -44,7 +44,13 @@ class UserMessagesController(
     ): Page<UserMessageDto> = userMessageService.find((principal.principal as JeluUser).user, read, messageCategories, pageable)
 
     @PutMapping(path = ["/user-messages/{id}"])
-    fun updateMessage(@PathVariable("id") messageId: UUID, @RequestBody @Valid updateDto: UpdateUserMessageDto): UserMessageDto {
+    fun updateMessage(
+        @PathVariable("id")
+        messageId: UUID,
+        @RequestBody
+        @Valid
+        updateDto: UpdateUserMessageDto
+    ): UserMessageDto {
         return userMessageService.update(messageId, updateDto)
     }
 

diff --git a/src/main/kotlin/io/github/bayang/jelu/controllers/UsersController.kt b/src/main/kotlin/io/github/bayang/jelu/controllers/UsersController.kt
@@ -103,7 +103,15 @@ class UsersController(
     fun usernameById(@PathVariable("id") userId: UUID) = mapOf<String, String>("username" to repository.findUserById(userId).login)
 
     @PutMapping(path = ["/users/{id}"])
-    fun updateUser(@PathVariable("id") userId: UUID, @RequestBody @Valid user: UpdateUserDto, principal: Authentication, session: HttpSession): UserDto {
+    fun updateUser(
+        @PathVariable("id")
+        userId: UUID,
+        @RequestBody
+        @Valid
+        user: UpdateUserDto,
+        principal: Authentication,
+        session: HttpSession
+    ): UserDto {
         if (principal.principal is JeluUser) {
             if ((principal.principal as JeluUser).user.isAdmin || (principal.principal as JeluUser).user.id.value == userId) {
                 // only admin user can remove or add admin rights

diff --git a/src/test/kotlin/io/github/bayang/jelu/service/imports/CsvImportServiceTest.kt b/src/test/kotlin/io/github/bayang/jelu/service/imports/CsvImportServiceTest.kt
@@ -194,7 +194,9 @@ class CsvImportServiceTest(
         Assertions.assertEquals("2018", imported.book.publishedDate)
         Assertions.assertNull(imported.book.image)
         val u = UserBookUpdateDto(
-            null, null, null,
+            null,
+            null,
+            null,
             BookCreateDto(
                 image = CalibreMetadataProvider.FILE_PREFIX + "test.jpg"
             ),