From e5f620749e528396cef67c9dfc62a110365f025b Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:17:07 +0900 Subject: [PATCH] style: fix lint --- .../activitypub/domain/model/Delete.kt | 12 ++--- .../hideout/activitypub/domain/model/Emoji.kt | 12 ++--- .../activitypub/domain/model/Follow.kt | 10 ++--- .../hideout/activitypub/domain/model/Note.kt | 24 +++++----- .../hideout/activitypub/domain/model/Undo.kt | 12 ++--- .../exposed/ExposedPaginationExtension.kt | 2 +- .../hideout/core/domain/model/actor/Actor.kt | 44 +++++++++---------- .../core/domain/model/emoji/CustomEmoji.kt | 6 +-- .../httpsignature/HttpSignatureUser.kt | 8 ++-- .../ExposedOAuth2AuthorizationService.kt | 2 +- .../springframework/oauth2/UserDetailsImpl.kt | 6 +-- .../core/service/media/MediaServiceImpl.kt | 2 +- .../image/ImageMediaProcessorConfiguration.kt | 2 +- .../ExposedGenerateTimelineService.kt | 1 - .../exposedquery/StatusQueryServiceImpl.kt | 2 +- ...goMastodonNotificationRepositoryWrapper.kt | 1 - .../interfaces/api/status/StatusesRequest.kt | 20 ++++----- .../mastodon/query/StatusQueryService.kt | 1 + .../service/account/AccountApiService.kt | 3 +- .../service/instance/InstanceApiService.kt | 2 +- .../dev/usbharu/hideout/util/LruCache.kt | 6 +-- 21 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt index 61ffb348..b19ac919 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt @@ -52,11 +52,11 @@ open class Delete : Object, HasId, HasActor { override fun toString(): String { return "Delete(" + - "apObject=$apObject, " + - "published='$published', " + - "actor='$actor', " + - "id='$id'" + - ")" + - " ${super.toString()}" + "apObject=$apObject, " + + "published='$published', " + + "actor='$actor', " + + "id='$id'" + + ")" + + " ${super.toString()}" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt index 2b9a0bee..8cd9b8f8 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt @@ -16,12 +16,12 @@ open class Emoji( override fun toString(): String { return "Emoji(" + - "name='$name', " + - "id='$id', " + - "updated='$updated', " + - "icon=$icon" + - ")" + - " ${super.toString()}" + "name='$name', " + + "id='$id', " + + "updated='$updated', " + + "icon=$icon" + + ")" + + " ${super.toString()}" } override fun equals(other: Any?): Boolean { diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt index 0216a2e3..35cd892c 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt @@ -36,10 +36,10 @@ open class Follow( override fun toString(): String { return "Follow(" + - "apObject='$apObject', " + - "actor='$actor', " + - "id=$id" + - ")" + - " ${super.toString()}" + "apObject='$apObject', " + + "actor='$actor', " + + "id=$id" + + ")" + + " ${super.toString()}" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt index b3383ef5..60e7858c 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt @@ -62,17 +62,17 @@ constructor( override fun toString(): String { return "Note(" + - "id='$id', " + - "attributedTo='$attributedTo', " + - "content='$content', " + - "published='$published', " + - "to=$to, " + - "cc=$cc, " + - "sensitive=$sensitive, " + - "inReplyTo=$inReplyTo, " + - "attachment=$attachment, " + - "tag=$tag" + - ")" + - " ${super.toString()}" + "id='$id', " + + "attributedTo='$attributedTo', " + + "content='$content', " + + "published='$published', " + + "to=$to, " + + "cc=$cc, " + + "sensitive=$sensitive, " + + "inReplyTo=$inReplyTo, " + + "attachment=$attachment, " + + "tag=$tag" + + ")" + + " ${super.toString()}" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt index 6f27026e..16555ae7 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt @@ -40,11 +40,11 @@ open class Undo( override fun toString(): String { return "Undo(" + - "actor='$actor', " + - "id='$id', " + - "apObject=$apObject, " + - "published=$published" + - ")" + - " ${super.toString()}" + "actor='$actor', " + + "id='$id', " + + "apObject=$apObject, " + + "published=$published" + + ")" + + " ${super.toString()}" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt b/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt index 7b0b0c4f..53b3fe72 100644 --- a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt +++ b/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt @@ -16,4 +16,4 @@ fun Query.withPagination(page: Page, exp: ExpressionWithColumnType): Pagi } return PaginationList(resultRows, resultRows.firstOrNull()?.getOrNull(exp), resultRows.lastOrNull()?.getOrNull(exp)) -} \ No newline at end of file +} diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt index 59ab16d3..5e8b4264 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt @@ -212,27 +212,27 @@ data class Actor private constructor( fun withLastPostAt(lastPostDate: Instant): Actor = this.copy(lastPostDate = lastPostDate) override fun toString(): String { return "Actor(" + - "id=$id, " + - "name='$name', " + - "domain='$domain', " + - "screenName='$screenName', " + - "description='$description', " + - "inbox='$inbox', " + - "outbox='$outbox', " + - "url='$url', " + - "publicKey='$publicKey', " + - "privateKey=$privateKey, " + - "createdAt=$createdAt, " + - "keyId='$keyId', " + - "followers=$followers, " + - "following=$following, " + - "instance=$instance, " + - "locked=$locked, " + - "followersCount=$followersCount, " + - "followingCount=$followingCount, " + - "postsCount=$postsCount, " + - "lastPostDate=$lastPostDate, " + - "emojis=$emojis" + - ")" + "id=$id, " + + "name='$name', " + + "domain='$domain', " + + "screenName='$screenName', " + + "description='$description', " + + "inbox='$inbox', " + + "outbox='$outbox', " + + "url='$url', " + + "publicKey='$publicKey', " + + "privateKey=$privateKey, " + + "createdAt=$createdAt, " + + "keyId='$keyId', " + + "followers=$followers, " + + "following=$following, " + + "instance=$instance, " + + "locked=$locked, " + + "followersCount=$followersCount, " + + "followingCount=$followingCount, " + + "postsCount=$postsCount, " + + "lastPostDate=$lastPostDate, " + + "emojis=$emojis" + + ")" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt index fb4579aa..1e96ecb7 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt @@ -10,9 +10,9 @@ sealed class Emoji { abstract fun id(): String override fun toString(): String { return "Emoji(" + - "domain='$domain', " + - "name='$name'" + - ")" + "domain='$domain', " + + "name='$name'" + + ")" } } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt index 2d546af0..c946664d 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt @@ -41,10 +41,10 @@ class HttpSignatureUser( override fun toString(): String { return "HttpSignatureUser(" + - "domain='$domain', " + - "id=$id" + - ")" + - " ${super.toString()}" + "domain='$domain', " + + "id=$id" + + ")" + + " ${super.toString()}" } companion object { diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt index 34e72833..9be529c2 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt @@ -273,7 +273,7 @@ class ExposedOAuth2AuthorizationService( oidcTokenIssuedAt, oidcTokenExpiresAt, oidcTokenMetadata.getValue(OAuth2Authorization.Token.CLAIMS_METADATA_NAME) - as MutableMap? + as MutableMap? ) builder.token(oidcIdToken) { it.putAll(oidcTokenMetadata) } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt index f41d3fe4..2cbd8b02 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt @@ -28,9 +28,9 @@ class UserDetailsImpl( ) : User(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities) { override fun toString(): String { return "UserDetailsImpl(" + - "id=$id" + - ")" + - " ${super.toString()}" + "id=$id" + + ")" + + " ${super.toString()}" } override fun equals(other: Any?): Boolean { diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt index 6cc50463..4f57917f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt @@ -29,7 +29,7 @@ class MediaServiceImpl( val fileName = mediaRequest.file.name logger.info( "Media upload. filename:$fileName " + - "contentType:${mediaRequest.file.contentType}" + "contentType:${mediaRequest.file.contentType}" ) val tempFile = Files.createTempFile("hideout-tmp-file", ".tmp") diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt index 23eeadb7..eb6c5537 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt @@ -8,7 +8,7 @@ data class ImageMediaProcessorConfiguration( val thubnail: ImageMediaProcessorThumbnailConfiguration?, val supportedType: List?, - ) +) data class ImageMediaProcessorThumbnailConfiguration( val generate: Boolean, diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt index b45300d5..229abc9c 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt @@ -32,7 +32,6 @@ class ExposedGenerateTimelineService(private val statusQueryService: StatusQuery } val result = query.withPagination(page, Timelines.id) - val statusQueries = result.map { StatusQuery( it[Timelines.postId], diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt index 07a8dbcb..2b9f3676 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt @@ -87,7 +87,7 @@ class StatusQueryServiceImpl : StatusQueryService { } val pairs = query - .withPagination(page,Posts.id) + .withPagination(page, Posts.id) .groupBy { it[Posts.id] } .map { it.value } .map { diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt index fb9593e6..17dc9ba3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt @@ -50,7 +50,6 @@ class MongoMastodonNotificationRepositoryWrapper( mongoTemplate.find(query, MastodonNotification::class.java) } - return PaginationList( mastodonNotifications, mastodonNotifications.firstOrNull()?.id, diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt index 0a9fac65..11b06068 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt @@ -66,16 +66,16 @@ class StatusesRequest { override fun toString(): String { return "StatusesRequest(" + - "status=$status, " + - "media_ids=$media_ids, " + - "poll=$poll, " + - "in_reply_to_id=$in_reply_to_id, " + - "sensitive=$sensitive, " + - "spoiler_text=$spoiler_text, " + - "visibility=$visibility, " + - "language=$language, " + - "scheduled_at=$scheduled_at" + - ")" + "status=$status, " + + "media_ids=$media_ids, " + + "poll=$poll, " + + "in_reply_to_id=$in_reply_to_id, " + + "sensitive=$sensitive, " + + "spoiler_text=$spoiler_text, " + + "visibility=$visibility, " + + "language=$language, " + + "scheduled_at=$scheduled_at" + + ")" } @Suppress("EnumNaming", "EnumEntryNameCase") diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt index c17a49a7..4ac2252b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt @@ -9,6 +9,7 @@ interface StatusQueryService { suspend fun findByPostIds(ids: List): List suspend fun findByPostIdsWithMediaIds(statusQueries: List): List + @Suppress("LongParameterList") suspend fun accountsStatus( accountId: Long, onlyMedia: Boolean = false, diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt index 42bb0e87..5ec3d733 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt @@ -20,6 +20,7 @@ import kotlin.math.min @Suppress("TooManyFunctions") interface AccountApiService { + @Suppress("ongParameterList") suspend fun accountsStatuses( userid: Long, onlyMedia: Boolean, @@ -87,7 +88,7 @@ class AccountApiServiceImpl( ): PaginationList { val canViewFollowers = if (loginUser == null) { false - }else if(loginUser == userid) { + } else if (loginUser == userid) { true } else { transaction.transaction { diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt index 2abc1169..b719cd6b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt @@ -19,7 +19,7 @@ class InstanceApiServiceImpl(private val applicationConfig: ApplicationConfig) : title = "Hideout Server", shortDescription = "Hideout test server", description = "This server is operated for testing of Hideout." + - " We are not responsible for any events that occur when associating with this server", + " We are not responsible for any events that occur when associating with this server", email = "i@usbharu.dev", version = "0.0.1", urls = V1InstanceUrls("wss://${url.host}"), diff --git a/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt b/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt index 77c891da..223063db 100644 --- a/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt +++ b/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt @@ -7,9 +7,9 @@ class LruCache(private val maxSize: Int) : LinkedHashMap(15, 0.75f, override fun removeEldestEntry(eldest: MutableMap.MutableEntry?): Boolean = size > maxSize override fun toString(): String { return "LruCache(" + - "maxSize=$maxSize" + - ")" + - " ${super.toString()}" + "maxSize=$maxSize" + + ")" + + " ${super.toString()}" } companion object {