From e799f8900c108e64b1f358ed26b8a176604b3f99 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Thu, 12 Oct 2023 11:11:36 +0900
Subject: [PATCH] style: fix lint

---
 .../kotlin/dev/usbharu/hideout/config/SecurityConfig.kt    | 1 +
 .../dev/usbharu/hideout/domain/model/UserDetailsImpl.kt    | 7 +++++--
 .../kotlin/dev/usbharu/hideout/service/ap/APService.kt     | 3 +++
 src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt       | 6 ++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt b/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt
index 82f61ed9..56bafa6c 100644
--- a/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt
@@ -42,6 +42,7 @@ import java.util.*
 
 @EnableWebSecurity(debug = false)
 @Configuration
+@Suppress("FunctionMaxLength ")
 class SecurityConfig {
 
     @Bean
diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt
index 6eb655bc..94812bbc 100644
--- a/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt
@@ -47,13 +47,12 @@ abstract class UserDetailsMixin
 
 class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
 
-    private val SIMPLE_GRANTED_AUTHORITY_SET = object : TypeReference<Set<SimpleGrantedAuthority>>() {}
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UserDetailsImpl {
         val mapper = p.codec as ObjectMapper
         val jsonNode: JsonNode = mapper.readTree(p)
         val authorities: Set<GrantedAuthority> = mapper.convertValue(
             jsonNode["authorities"],
-            SIMPLE_GRANTED_AUTHORITY_SET
+            Companion.SIMPLE_GRANTED_AUTHORITY_SET
         )
 
         val password = jsonNode.readText("password")
@@ -75,4 +74,8 @@ class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
             else -> defaultValue
         }
     }
+
+    companion object {
+        private val SIMPLE_GRANTED_AUTHORITY_SET = object : TypeReference<Set<SimpleGrantedAuthority>>() {}
+    }
 }
diff --git a/src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt b/src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt
index 6e241375..0e14909c 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt
@@ -219,9 +219,12 @@ class APServiceImpl(
         }
     }
 
+    @Suppress("REDUNDANT_ELSE_IN_WHEN")
     override suspend fun <T : HideoutJob> processActivity(job: JobContextWithProps<T>, hideoutJob: HideoutJob) {
         logger.debug("processActivity: ${hideoutJob.name}")
 
+        @Suppress("ElseCaseInsteadOfExhaustiveWhen")
+        // Springで作成されるプロキシの都合上パターンマッチングが壊れるので必須
         when (hideoutJob) {
             is ReceiveFollowJob -> {
                 apReceiveFollowService.receiveFollowJob(
diff --git a/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt b/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt
index c6c1bfe5..882a211f 100644
--- a/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt
@@ -17,8 +17,7 @@ object HttpUtil {
 
     fun isContentTypeOfActivityPub(
         contentType: String,
-        subType: String,
-        parameter: String
+        subType: String
     ): Boolean {
         if (contentType != "application") {
             return false
@@ -32,8 +31,7 @@ object HttpUtil {
     fun isContentTypeOfActivityPub(contentType: ContentType): Boolean {
         return isContentTypeOfActivityPub(
             contentType.contentType,
-            contentType.contentSubtype,
-            contentType.parameter("profile").orEmpty()
+            contentType.contentSubtype
         )
     }
 //    fun