From 9ce3e7fa0abad4fc1974b4c9fc5b0fb2690b1c63 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Mon, 20 Jan 2025 23:31:00 +0800 Subject: [PATCH] small refactor --- .../gbcs/cli/impl/commands/BenchmarkCommand.kt | 4 ++-- .../gbcs/cli/impl/commands/ClientCommand.kt | 6 +++--- .../gbcs/cli/impl/commands/GetCommand.kt | 4 ++-- .../gbcs/cli/impl/commands/PutCommand.kt | 4 ++-- .../kotlin/net/woggioni/gbcs/client/Client.kt | 2 +- .../net/woggioni/gbcs/client/impl/Parser.kt | 16 ++++++++-------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt index be83f08..bd25e08 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt +++ b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt @@ -4,7 +4,7 @@ import net.woggioni.gbcs.common.contextLogger import net.woggioni.gbcs.common.error import net.woggioni.gbcs.common.info import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GbcsClient +import net.woggioni.gbcs.client.GradleBuildCacheClient import picocli.CommandLine import java.security.SecureRandom import java.time.Duration @@ -40,7 +40,7 @@ class BenchmarkCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - val client = GbcsClient(profile) + val client = GradleBuildCacheClient(profile) val entryGenerator = sequence { val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong()) diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt index af52048..9565b75 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt +++ b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt @@ -1,7 +1,7 @@ package net.woggioni.gbcs.cli.impl.commands import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GbcsClient +import net.woggioni.gbcs.client.GradleBuildCacheClient import net.woggioni.jwo.Application import picocli.CommandLine import java.nio.file.Path @@ -28,8 +28,8 @@ class ClientCommand(app : Application) : GbcsCommand() { ) var profileName : String? = null - val configuration : GbcsClient.Configuration by lazy { - GbcsClient.Configuration.parse(configurationFile) + val configuration : GradleBuildCacheClient.Configuration by lazy { + GradleBuildCacheClient.Configuration.parse(configurationFile) } override fun run() { diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt index fc9d8f7..aa7048d 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt +++ b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt @@ -2,7 +2,7 @@ package net.woggioni.gbcs.cli.impl.commands import net.woggioni.gbcs.common.contextLogger import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GbcsClient +import net.woggioni.gbcs.client.GradleBuildCacheClient import picocli.CommandLine import java.nio.file.Files import java.nio.file.Path @@ -38,7 +38,7 @@ class GetCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GbcsClient(profile).use { client -> + GradleBuildCacheClient(profile).use { client -> client.get(key).thenApply { value -> value?.let { (output?.let(Files::newOutputStream) ?: System.out).use { diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt index 993ff6f..f90a016 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt +++ b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt @@ -3,7 +3,7 @@ package net.woggioni.gbcs.cli.impl.commands import net.woggioni.gbcs.common.contextLogger import net.woggioni.gbcs.cli.impl.GbcsCommand import net.woggioni.gbcs.cli.impl.converters.InputStreamConverter -import net.woggioni.gbcs.client.GbcsClient +import net.woggioni.gbcs.client.GradleBuildCacheClient import picocli.CommandLine import java.io.InputStream @@ -39,7 +39,7 @@ class PutCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GbcsClient(profile).use { client -> + GradleBuildCacheClient(profile).use { client -> value.use { client.put(key, it.readAllBytes()) }.get() diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt b/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt index 85dab7e..4213f41 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt +++ b/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt @@ -48,7 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger import io.netty.util.concurrent.Future as NettyFuture -class GbcsClient(private val profile: Configuration.Profile) : AutoCloseable { +class GradleBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable { private val group: NioEventLoopGroup private var sslContext: SslContext private val log = contextLogger() diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt b/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt index d775234..63c10e3 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt +++ b/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt @@ -3,7 +3,7 @@ package net.woggioni.gbcs.client.impl import net.woggioni.gbcs.api.exception.ConfigurationException import net.woggioni.gbcs.common.Xml.Companion.asIterable import net.woggioni.gbcs.common.Xml.Companion.renderAttribute -import net.woggioni.gbcs.client.GbcsClient +import net.woggioni.gbcs.client.GradleBuildCacheClient import org.w3c.dom.Document import java.net.URI import java.nio.file.Files @@ -15,10 +15,10 @@ import java.time.Duration object Parser { - fun parse(document: Document): GbcsClient.Configuration { + fun parse(document: Document): GradleBuildCacheClient.Configuration { val root = document.documentElement - val profiles = mutableMapOf() + val profiles = mutableMapOf() for (child in root.asIterable()) { val tagName = child.localName @@ -26,7 +26,7 @@ object Parser { "profile" -> { val name = child.renderAttribute("name") ?: throw ConfigurationException("name attribute is required") val uri = child.renderAttribute("base-url")?.let(::URI) ?: throw ConfigurationException("base-url attribute is required") - var authentication: GbcsClient.Configuration.Authentication? = null + var authentication: GradleBuildCacheClient.Configuration.Authentication? = null for (gchild in child.asIterable()) { when (gchild.localName) { "tls-client-auth" -> { @@ -47,14 +47,14 @@ object Parser { .toList() .toTypedArray() authentication = - GbcsClient.Configuration.Authentication.TlsClientAuthenticationCredentials(key, certChain) + GradleBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials(key, certChain) } "basic-auth" -> { val username = gchild.renderAttribute("user") ?: throw ConfigurationException("username attribute is required") val password = gchild.renderAttribute("password") ?: throw ConfigurationException("password attribute is required") authentication = - GbcsClient.Configuration.Authentication.BasicAuthenticationCredentials(username, password) + GradleBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials(username, password) } } } @@ -63,10 +63,10 @@ object Parser { ?: 50 val connectionTimeout = child.renderAttribute("connection-timeout") ?.let(Duration::parse) - profiles[name] = GbcsClient.Configuration.Profile(uri, authentication, connectionTimeout, maxConnections) + profiles[name] = GradleBuildCacheClient.Configuration.Profile(uri, authentication, connectionTimeout, maxConnections) } } } - return GbcsClient.Configuration(profiles) + return GradleBuildCacheClient.Configuration(profiles) } } \ No newline at end of file