refactor: simplify class constructors and method return types for improved readability

Author: cmdjulian

kirc-blocking/src/main/kotlin/de/cmdjulian/kirc/client/BlockingContainerImageClientFactory.kt

@@ -30,11 +30,9 @@ object BlockingContainerImageClientFactory {
         keystore: KeyStore? = null,
         timeout: Duration = Duration.ofSeconds(15),
         tmpPath: Path = Path(SystemTemporaryDirectory.toString()),
-    ): BlockingContainerImageRegistryClient {
-        return SuspendingContainerImageClientFactory
-            .create(url, credentials, proxy, skipTlsVerify, keystore, timeout, tmpPath)
-            .toBlockingClient()
-    }
+    ): BlockingContainerImageRegistryClient = SuspendingContainerImageClientFactory
+        .create(url, credentials, proxy, skipTlsVerify, keystore, timeout, tmpPath)
+        .toBlockingClient()
 
     @JvmStatic
     @JvmOverloads

kirc-image/src/main/kotlin/de/cmdjulian/kirc/image/Reference.kt

@@ -26,7 +26,9 @@ sealed interface Reference {
  * Example: "repository:latest"
  */
 @ReflectionHint
-class Tag(@JsonValue private val value: String) : Reference, Comparable<Tag> {
+class Tag(@JsonValue private val value: String) :
+    Reference,
+    Comparable<Tag> {
     init {
         require(value.matches(Regex("\\w[\\w.\\-]{0,127}"))) { "invalid tag" }
     }
@@ -64,7 +66,9 @@ class Tag(@JsonValue private val value: String) : Reference, Comparable<Tag> {
  * Example: "repository@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
  */
 @ReflectionHint
-class Digest(@JsonValue private val value: String) : Reference, Comparable<Digest> {
+class Digest(@JsonValue private val value: String) :
+    Reference,
+    Comparable<Digest> {
     init {
         require(value.matches(Regex("sha256:[\\da-fA-F]{32,}"))) { "invalid digest" }
     }

kirc-reactive/src/main/kotlin/de/cmdjulian/kirc/client/ReactiveContainerImageRegistryClient.kt

@@ -133,12 +133,10 @@ fun SuspendingContainerImageRegistryClient.toReactiveClient() = object : Reactiv
         repository: Repository,
         reference: Reference,
         manifest: ManifestSingle?,
-    ): Mono<ReactiveContainerImageClient> {
-        return if (manifest == null) {
-            mono { this@toReactiveClient.toImageClient(repository, reference).toReactiveClient() }
-        } else {
-            Mono.just(this@toReactiveClient.toImageClient(repository, reference, manifest).toReactiveClient())
-        }
+    ): Mono<ReactiveContainerImageClient> = if (manifest == null) {
+        mono { this@toReactiveClient.toImageClient(repository, reference).toReactiveClient() }
+    } else {
+        Mono.just(this@toReactiveClient.toImageClient(repository, reference, manifest).toReactiveClient())
     }
 
     override fun upload(

kirc-suspending/src/main/kotlin/de/cmdjulian/kirc/impl/KircApiError.kt

@@ -17,32 +17,25 @@ internal sealed class KircApiError(
     val detailMessage = "$message (HTTP statusCode=$statusCode method=$method url=$url)"
 
     /** Error as returned by the registry. */
-    class Registry(
-        statusCode: Int,
-        url: Url,
-        method: HttpMethod,
-        val body: RegistryErrorResponse,
-    ) : KircApiError(
-        statusCode,
-        url,
-        method,
-        null,
-        "Registry error: [${
-            body.errors.joinToString(
-                prefix = "(",
-                postfix = ")",
-            ) { "code=${it.code}, message=${it.message}, detail=${it.detail}" }
-        }]",
-    ) {
+    class Registry(statusCode: Int, url: Url, method: HttpMethod, val body: RegistryErrorResponse) :
+        KircApiError(
+            statusCode,
+            url,
+            method,
+            null,
+            "Registry error: [${
+                body.errors.joinToString(
+                    prefix = "(",
+                    postfix = ")",
+                ) { "code=${it.code}, message=${it.message}, detail=${it.detail}" }
+            }]",
+        ) {
         override fun toString(): String = "KircApiError.Registry -> ${this@Registry.message}"
     }
 
     /** Error caused by network issues, e.g. no connection, timeout, etc. */
-    class Network(
-        url: Url,
-        method: HttpMethod,
-        override val cause: Throwable,
-    ) : KircApiError(-1, url, method, cause, cause.message ?: "Unknown network error") {
+    class Network(url: Url, method: HttpMethod, override val cause: Throwable) :
+        KircApiError(-1, url, method, cause, cause.message ?: "Unknown network error") {
         override fun toString(): String = "KircApiError.Network -> ${this@Network.message}"
     }
 
@@ -53,12 +46,8 @@ internal sealed class KircApiError(
      *
      * Appears while manually extracting fields from responses (no deserialization)
      */
-    class Header(
-        statusCode: Int,
-        url: Url,
-        method: HttpMethod,
-        override val message: String,
-    ) : KircApiError(statusCode, url, method, null, message) {
+    class Header(statusCode: Int, url: Url, method: HttpMethod, override val message: String) :
+        KircApiError(statusCode, url, method, null, message) {
         override fun toString(): String = "KircApiError.Header -> ${this@Header.message}"
     }
 
@@ -67,25 +56,16 @@ internal sealed class KircApiError(
      *
      * E.g. when deserializing error responses from the registry or the token response from the auth server.
      */
-    class Json(
-        statusCode: Int,
-        url: Url,
-        method: HttpMethod,
-        override val cause: Throwable,
-        message: String,
-    ) : KircApiError(statusCode, url, method, cause, message) {
+    class Json(statusCode: Int, url: Url, method: HttpMethod, override val cause: Throwable, message: String) :
+        KircApiError(statusCode, url, method, cause, message) {
         override fun toString(): String = "KircApiError.Json -> ${this@Json.message}"
     }
 
     /**
      * Thrown when an authentication bearer token could not be retrieved from the auth server.
      */
-    class Bearer(
-        statusCode: Int,
-        url: Url,
-        method: HttpMethod,
-        override val message: String,
-    ) : KircApiError(statusCode, url, method, null, message) {
+    class Bearer(statusCode: Int, url: Url, method: HttpMethod, override val message: String) :
+        KircApiError(statusCode, url, method, null, message) {
         override fun toString(): String = "KircApiError.Bearer -> ${this@Bearer.message}"
     }
 

kirc-suspending/src/main/kotlin/de/cmdjulian/kirc/impl/delegate/ImageDownloader.kt

@@ -270,10 +270,7 @@ internal class ImageDownloader(private val client: SuspendingContainerImageRegis
             val configStream: Source,
         ) : ResolvedManifest
 
-        data class List(
-            override val manifest: ManifestList,
-            override val digest: Digest,
-            override val size: Long,
-        ) : ResolvedManifest
+        data class List(override val manifest: ManifestList, override val digest: Digest, override val size: Long) :
+            ResolvedManifest
     }
 }

kirc-suspending/src/main/kotlin/de/cmdjulian/kirc/utils/KtorInitUtils.kt

@@ -109,11 +109,7 @@ private suspend fun RefreshTokensParams.bearerAuth(credentials: RegistryCredenti
 
 // HELPER
 
-private data class RegistryAuthCredentials(
-    val realm: String,
-    val scope: String?,
-    val service: String?,
-)
+private data class RegistryAuthCredentials(val realm: String, val scope: String?, val service: String?)
 
 private fun RefreshTokensParams.parseWWWAuthHeader(header: String?): RegistryAuthCredentials {
     val wwwAuth = header?.runCatching(HttpAuthCredentials::parse)?.getOrElse {

kirc-suspending/src/test/kotlin/de/cmdjulian/kirc/JacksonExtensions.kt

@@ -2,6 +2,4 @@ package de.cmdjulian.kirc
 
 import de.cmdjulian.kirc.impl.serialization.JsonMapper
 
-internal inline fun <reified T : Any> String.unmarshal(): T {
-    return JsonMapper.readValue(this, T::class.java)
-}
+internal inline fun <reified T : Any> String.unmarshal(): T = JsonMapper.readValue(this, T::class.java)

kirc-suspending/src/test/kotlin/de/cmdjulian/kirc/testcontainer/AuthServerTestContainer.kt

@@ -5,9 +5,7 @@ import org.testcontainers.containers.Network
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.utility.MountableFile
 
-class AuthServerTestContainer(
-    network: Network,
-) : GenericContainer<AuthServerTestContainer>("cesanta/docker_auth:1") {
+class AuthServerTestContainer(network: Network) : GenericContainer<AuthServerTestContainer>("cesanta/docker_auth:1") {
 
     init {
         withNetwork(network)

kirc-suspending/src/test/kotlin/de/cmdjulian/kirc/testcontainer/RegistryTestContainer.kt

@@ -4,7 +4,7 @@ import org.testcontainers.containers.GenericContainer
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.utility.MountableFile
 
-class RegistryTestContainer() : GenericContainer<RegistryTestContainer>("registry:2") {
+class RegistryTestContainer : GenericContainer<RegistryTestContainer>("registry:2") {
 
     private val registryDataFolder = "/var/lib/registry"