From 0fdceb4d9e61179a4e0082aa369f0984add86fc9 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:10:04 +0900 Subject: [PATCH] style: fix lint --- .../dev/usbharu/hideout/controller/InboxControllerImpl.kt | 1 + .../kotlin/dev/usbharu/hideout/repository/UserQueryMapper.kt | 4 +--- .../dev/usbharu/hideout/repository/UserRepositoryImpl.kt | 5 ++--- .../service/signature/HttpSignatureUserDetailsService.kt | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/controller/InboxControllerImpl.kt b/src/main/kotlin/dev/usbharu/hideout/controller/InboxControllerImpl.kt index 235c821f..e06ec648 100644 --- a/src/main/kotlin/dev/usbharu/hideout/controller/InboxControllerImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/controller/InboxControllerImpl.kt @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController @RestController class InboxControllerImpl(private val apService: APService) : InboxController { + @Suppress("TooGenericExceptionCaught") override suspend fun inbox(@RequestBody string: String): ResponseEntity { val parseActivity = try { apService.parseActivity(string) diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/UserQueryMapper.kt b/src/main/kotlin/dev/usbharu/hideout/repository/UserQueryMapper.kt index 62828e72..d4969965 100644 --- a/src/main/kotlin/dev/usbharu/hideout/repository/UserQueryMapper.kt +++ b/src/main/kotlin/dev/usbharu/hideout/repository/UserQueryMapper.kt @@ -6,7 +6,5 @@ import org.springframework.stereotype.Component @Component class UserQueryMapper(private val userResultRowMapper: ResultRowMapper) : QueryMapper { - override fun map(query: Query): List { - return query.map(userResultRowMapper::map) - } + override fun map(query: Query): List = query.map(userResultRowMapper::map) } diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepositoryImpl.kt b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepositoryImpl.kt index 0a1a9958..1a37c5d2 100644 --- a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepositoryImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepositoryImpl.kt @@ -55,9 +55,8 @@ class UserRepositoryImpl( return user } - override suspend fun findById(id: Long): User? { - return Users.select { Users.id eq id }.singleOrNull()?.let(userResultRowMapper::map) - } + override suspend fun findById(id: Long): User? = + Users.select { Users.id eq id }.singleOrNull()?.let(userResultRowMapper::map) override suspend fun deleteFollowRequest(id: Long, follower: Long) { FollowRequests.deleteWhere { userId.eq(id) and followerId.eq(follower) } diff --git a/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureUserDetailsService.kt b/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureUserDetailsService.kt index 0f58350c..ba12cca0 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureUserDetailsService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureUserDetailsService.kt @@ -40,6 +40,7 @@ class HttpSignatureUserDetailsService( } } + @Suppress("TooGenericExceptionCaught") val verify = try { httpSignatureVerifier.verify( token.credentials as HttpRequest,