From de2761e3cf120b4edb8dcffeef80d1e6a125ab09 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 6 Dec 2023 22:19:56 +0900
Subject: [PATCH] style: fix lint

---
 .../hideout/activitypub/domain/model/Person.kt  |  2 ++
 .../hideout/application/config/SpringConfig.kt  |  1 -
 .../interfaces/api/media/LocalFileController.kt |  2 --
 .../media/LocalFileSystemMediaDataStore.kt      | 17 ++++++++++-------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
index c04ba736..cba9eeaf 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
@@ -20,6 +20,7 @@ constructor(
     var following: String?
 ) : Object(add(type, "Person")), HasId, HasName {
 
+    @Suppress("CyclomaticComplexMethod", "CognitiveComplexMethod")
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
@@ -43,6 +44,7 @@ constructor(
         return true
     }
 
+    @Suppress("CyclomaticComplexMethod")
     override fun hashCode(): Int {
         var result = super.hashCode()
         result = 31 * result + name.hashCode()
diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt b/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt
index f3e088ab..c05229b7 100644
--- a/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt
@@ -42,7 +42,6 @@ data class S3StorageConfig(
     val secretKey: String
 )
 
-
 /**
  * メディアの保存にローカルファイルシステムを使用する際のコンフィグ
  *
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt b/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt
index 772e7b46..555cb592 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt
@@ -25,7 +25,6 @@ class LocalFileController(
 
     @GetMapping("/files/{id}")
     fun files(@PathVariable("id") id: String): ResponseEntity<Resource> {
-
         val name = Path.of(id).name
         val path = savePath.resolve(name)
 
@@ -41,7 +40,6 @@ class LocalFileController(
 
     @GetMapping("/users/{user}/icon.jpg", "/users/{user}/header.jpg")
     fun icons(): ResponseEntity<Resource> {
-
         val pathResource = ClassPathResource("icon.png")
         return ResponseEntity
             .ok()
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt
index a7300081..412b50a5 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt
@@ -12,8 +12,6 @@ import kotlin.io.path.createDirectories
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.outputStream
 
-@Service
-@ConditionalOnProperty("hideout.storage.type", havingValue = "local", matchIfMissing = true)
 /**
  * ローカルファイルシステムにメディアを保存します
  *
@@ -23,8 +21,11 @@ import kotlin.io.path.outputStream
  * @param applicationConfig ApplicationConfig
  * @param localStorageConfig LocalStorageConfig
  */
+@Service
+@ConditionalOnProperty("hideout.storage.type", havingValue = "local", matchIfMissing = true)
 class LocalFileSystemMediaDataStore(
-    applicationConfig: ApplicationConfig, localStorageConfig: LocalStorageConfig
+    applicationConfig: ApplicationConfig,
+    localStorageConfig: LocalStorageConfig
 ) : MediaDataStore {
 
     private val savePath: Path = Path.of(localStorageConfig.path).toAbsolutePath()
@@ -39,7 +40,6 @@ class LocalFileSystemMediaDataStore(
         val fileSavePath = buildSavePath(savePath, dataMediaSave.name)
         val thumbnailSavePath = buildSavePath(savePath, "thumbnail-" + dataMediaSave.name)
 
-
         dataMediaSave.thumbnailInputStream?.inputStream()?.use {
             it.buffered().use { bufferedInputStream ->
                 thumbnailSavePath.outputStream(StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
@@ -51,7 +51,6 @@ class LocalFileSystemMediaDataStore(
             }
         }
 
-
         dataMediaSave.fileInputStream.inputStream().use {
             it.buffered().use { bufferedInputStream ->
                 fileSavePath.outputStream(StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
@@ -60,7 +59,9 @@ class LocalFileSystemMediaDataStore(
         }
 
         return SuccessSavedMedia(
-            dataMediaSave.name, publicUrl + dataMediaSave.name, publicUrl + "thumbnail-" + dataMediaSave.name
+            dataMediaSave.name,
+            publicUrl + dataMediaSave.name,
+            publicUrl + "thumbnail-" + dataMediaSave.name
         )
     }
 
@@ -82,7 +83,9 @@ class LocalFileSystemMediaDataStore(
 
         logger.info("SUCCESS Media upload. {}", dataSaveRequest.name)
         return SuccessSavedMedia(
-            dataSaveRequest.name, publicUrl + dataSaveRequest.name, publicUrl + "thumbnail-" + dataSaveRequest.name
+            dataSaveRequest.name,
+            publicUrl + dataSaveRequest.name,
+            publicUrl + "thumbnail-" + dataSaveRequest.name
         )
     }