From 6960bdf497db2fb0ccf6f572e6691115c95fa69b Mon Sep 17 00:00:00 2001 From: davotoula Date: Wed, 13 May 2026 10:15:26 +0200 Subject: [PATCH] refactor(sonar): hoist return before if-else MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sonar — collapse 'if (X) { ...; return A } else { ...; return B }' to 'return if (X) { ...; A } else { ...; B }' across 5 files. Mechanically equivalent. PlaybackService.lazyPool keeps its in-branch non-local returns from .let{} blocks (those are early-out cache hits, not tail returns). --- .../vitorpamplona/amethyst/model/Account.kt | 6 ++-- .../amethyst/model/AntiSpamFilter.kt | 6 ++-- .../amethyst/model/LocalCache.kt | 30 +++++++++---------- .../playback/service/PlaybackService.kt | 6 ++-- .../uploads/blossom/bud10/ServerHeadCache.kt | 6 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 4019e6f66b..db26d62062 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -943,16 +943,16 @@ class Account( } if (event is GiftWrapEvent) { val receiver = event.recipientPubKey() - if (receiver != null) { + return if (receiver != null) { val relayList = cache .getOrCreateUser(receiver) .dmInboxRelayList() ?.relays() ?.ifEmpty { null } - return relayList?.toSet() ?: computeRelayListForLinkedUser(receiver) + relayList?.toSet() ?: computeRelayListForLinkedUser(receiver) } else { - return emptySet() + emptySet() } } if (event is WrappedEvent) { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt index d5033201bb..791d69dff1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt @@ -143,7 +143,7 @@ class AntiSpamFilter { ): Spammer { val spammer = spamMessages.get(hashCode) - if (spammer == null) { + return if (spammer == null) { val newSpammer = if (event is AddressableEvent) { Spammer( @@ -159,14 +159,14 @@ class AntiSpamFilter { ) } spamMessages.put(hashCode, newSpammer) - return newSpammer + newSpammer } else { if (event is AddressableEvent) { spammer.duplicatedEventAddresses += event.address() } else { spammer.duplicatedEventIds += event.id } - return spammer + spammer } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 5a50365a20..d50daf6b7d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -671,7 +671,7 @@ object LocalCache : ILocalCache, ICacheProvider { return false } - if (wasVerified || justVerify(event)) { + return if (wasVerified || justVerify(event)) { val replyTo = computeReplyTo(event) note.loadEvent(event, author, replyTo) @@ -681,9 +681,9 @@ object LocalCache : ILocalCache, ICacheProvider { refreshNewNoteObservers(note) - return true + true } else { - return false + false } } @@ -1118,7 +1118,7 @@ object LocalCache : ILocalCache, ICacheProvider { // Already processed this event. if (replaceableNote.event?.id == event.id) return isVerified - if (event.createdAt > (replaceableNote.createdAt() ?: 0L) && (isVerified || justVerify(event))) { + return if (event.createdAt > (replaceableNote.createdAt() ?: 0L) && (isVerified || justVerify(event))) { // clear index from previous tags replaceableNote.replyTo?.forEach { it.removeNote(replaceableNote) @@ -1128,9 +1128,9 @@ object LocalCache : ILocalCache, ICacheProvider { refreshNewNoteObservers(replaceableNote) - return true + true } else { - return false + false } } @@ -1150,7 +1150,7 @@ object LocalCache : ILocalCache, ICacheProvider { // Already processed this event. if (note.event != null) return false - if (wasVerified || justVerify(event)) { + return if (wasVerified || justVerify(event)) { note.loadEvent(event, author, emptyList()) if (deletionIndex.add(event, wasVerified)) { @@ -1205,9 +1205,9 @@ object LocalCache : ILocalCache, ICacheProvider { refreshNewNoteObservers(note) - return true + true } else { - return false + false } } @@ -2061,10 +2061,10 @@ object LocalCache : ILocalCache, ICacheProvider { } if (note.event?.isContentEncoded() == false) { - if (!note.isHiddenFor(hiddenUsers.flow.value)) { - return@filter note.event?.content?.contains(text, true) ?: false + return@filter if (!note.isHiddenFor(hiddenUsers.flow.value)) { + note.event?.content?.contains(text, true) ?: false } else { - return@filter false + false } } @@ -2082,10 +2082,10 @@ object LocalCache : ILocalCache, ICacheProvider { } if (addressable.event?.isContentEncoded() == false) { - if (!addressable.isHiddenFor(hiddenUsers.flow.value)) { - return@filter addressable.event?.content?.contains(text, true) ?: false + return@filter if (!addressable.isHiddenFor(hiddenUsers.flow.value)) { + addressable.event?.content?.contains(text, true) ?: false } else { - return@filter false + false } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackService.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackService.kt index 795f041578..0c636f8a9a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackService.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackService.kt @@ -96,7 +96,7 @@ class PlaybackService : MediaSessionService() { @OptIn(UnstableApi::class) fun lazyPool(proxyPort: Int): MediaSessionPool { - if (proxyPort <= 0) { + return if (proxyPort <= 0) { // no proxy poolNoProxy?.let { return it } @@ -105,7 +105,7 @@ class PlaybackService : MediaSessionService() { val blossomServerResolver = Amethyst.instance.blossomResolver // creates new - return newPool(videoCache, okHttpClient, blossomServerResolver) + newPool(videoCache, okHttpClient, blossomServerResolver) .also { poolNoProxy = it // Kick off the player pool warmup as soon as we know this pool is being used. @@ -124,7 +124,7 @@ class PlaybackService : MediaSessionService() { val videoCache = Amethyst.instance.videoCache val blossomServerResolver = Amethyst.instance.blossomResolver - return newPool(videoCache, okHttpClient, blossomServerResolver) + newPool(videoCache, okHttpClient, blossomServerResolver) .also { poolWithProxy = it it.exoPlayerPool.create(applicationContext) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/bud10/ServerHeadCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/bud10/ServerHeadCache.kt index 4653c50afc..0c0db2139c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/bud10/ServerHeadCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/bud10/ServerHeadCache.kt @@ -64,13 +64,13 @@ class ServerHeadCache { val contentLength = response.header("Content-Length")?.toLongOrNull() val mimeType = response.header("Content-Type")?.toMediaType()?.toString() - if (contentLength != null && mimeType != null) { + return if (contentLength != null && mimeType != null) { val result = HasFile.TypeAndSize(mimeType, contentLength) cache.put(url, result) - return result + result } else { cache.put(url, HasFile.NoFile) - return HasFile.NoFile + HasFile.NoFile } } } catch (e: Exception) {