From 42eb26a9484c75bd51404d19927a300a9ce05a0e Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Wed, 19 Feb 2025 22:40:14 +0800 Subject: [PATCH] optimize imports --- .../src/main/java/net/woggioni/rbcs/api/Configuration.java | 2 -- .../net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt | 2 +- .../net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt | 2 +- .../woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt | 1 - .../woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt | 2 +- .../kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt | 4 ---- .../src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt | 1 - .../src/main/kotlin/net/woggioni/rbcs/common/Logging.kt | 2 +- rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt | 1 - .../woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt | 2 +- .../net/woggioni/rbcs/server/cache/FileSystemCacheHandler.kt | 2 -- .../net/woggioni/rbcs/server/throttling/BucketManager.kt | 2 +- .../net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt | 5 ++--- 13 files changed, 8 insertions(+), 20 deletions(-) diff --git a/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java index 1f492d7..39bce5d 100644 --- a/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java @@ -1,7 +1,6 @@ package net.woggioni.rbcs.api; -import io.netty.channel.ChannelInboundHandler; import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.Value; @@ -11,7 +10,6 @@ import java.security.cert.X509Certificate; import java.time.Duration; import java.util.Map; import java.util.Set; -import java.util.function.Supplier; import java.util.stream.Collectors; @Value diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt index 3e5843d..6ee25cd 100644 --- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt @@ -1,5 +1,6 @@ package net.woggioni.rbcs.cli +import net.woggioni.jwo.Application import net.woggioni.rbcs.cli.impl.AbstractVersionProvider import net.woggioni.rbcs.cli.impl.RbcsCommand import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand @@ -11,7 +12,6 @@ import net.woggioni.rbcs.cli.impl.commands.PutCommand import net.woggioni.rbcs.cli.impl.commands.ServerCommand import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory import net.woggioni.rbcs.common.contextLogger -import net.woggioni.jwo.Application import picocli.CommandLine import picocli.CommandLine.Model.CommandSpec diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt index f686534..4f1342c 100644 --- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt @@ -1,8 +1,8 @@ package net.woggioni.rbcs.cli.impl.commands +import net.woggioni.jwo.Application import net.woggioni.rbcs.cli.impl.RbcsCommand import net.woggioni.rbcs.client.RemoteBuildCacheClient -import net.woggioni.jwo.Application import picocli.CommandLine import java.nio.file.Path diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt index 6b0bbab..0156f86 100644 --- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt @@ -2,7 +2,6 @@ package net.woggioni.rbcs.cli.impl.commands import net.woggioni.rbcs.cli.impl.RbcsCommand import net.woggioni.rbcs.client.RemoteBuildCacheClient -import net.woggioni.rbcs.common.contextLogger import net.woggioni.rbcs.common.createLogger import picocli.CommandLine import java.security.SecureRandom diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt index c5f9ecd..7111cec 100644 --- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt @@ -1,9 +1,9 @@ package net.woggioni.rbcs.cli.impl.commands +import net.woggioni.jwo.UncloseableOutputStream import net.woggioni.rbcs.cli.impl.RbcsCommand import net.woggioni.rbcs.cli.impl.converters.OutputStreamConverter import net.woggioni.rbcs.common.PasswordSecurity.hashPassword -import net.woggioni.jwo.UncloseableOutputStream import picocli.CommandLine import java.io.OutputStream import java.io.OutputStreamWriter diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt index e201674..dc0fcc5 100644 --- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt @@ -6,16 +6,12 @@ import net.woggioni.jwo.NullOutputStream import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.cli.impl.RbcsCommand import net.woggioni.rbcs.client.RemoteBuildCacheClient -import net.woggioni.rbcs.common.contextLogger import net.woggioni.rbcs.common.createLogger import picocli.CommandLine import java.io.InputStream import java.nio.file.Files import java.nio.file.Path -import java.security.DigestInputStream -import java.security.MessageDigest import java.util.UUID -import kotlin.io.encoding.decodingWith @CommandLine.Command( name = "put", diff --git a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt index 7c955d8..2e8a328 100644 --- a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt @@ -1,6 +1,5 @@ package net.woggioni.rbcs.client.impl -import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.exception.ConfigurationException import net.woggioni.rbcs.client.RemoteBuildCacheClient import net.woggioni.rbcs.common.Xml.Companion.asIterable diff --git a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt index c928e5e..b0e7c13 100644 --- a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt @@ -1,7 +1,7 @@ package net.woggioni.rbcs.common -import io.netty.channel.ChannelHandlerContext import io.netty.channel.Channel +import io.netty.channel.ChannelHandlerContext import org.slf4j.Logger import org.slf4j.LoggerFactory import org.slf4j.MDC diff --git a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt index f317226..3648fbd 100644 --- a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt @@ -1,7 +1,6 @@ package net.woggioni.rbcs.common import net.woggioni.jwo.JWO -import org.slf4j.LoggerFactory import org.slf4j.event.Level import org.w3c.dom.Document import org.w3c.dom.Element diff --git a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt index 4c7064b..371c13d 100644 --- a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt @@ -2,8 +2,8 @@ package net.woggioni.rbcs.server.memcache import net.woggioni.rbcs.api.CacheProvider import net.woggioni.rbcs.api.exception.ConfigurationException -import net.woggioni.rbcs.common.RBCS import net.woggioni.rbcs.common.HostAndPort +import net.woggioni.rbcs.common.RBCS import net.woggioni.rbcs.common.Xml import net.woggioni.rbcs.common.Xml.Companion.asIterable import net.woggioni.rbcs.common.Xml.Companion.renderAttribute diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheHandler.kt index fca3bc6..9451a42 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheHandler.kt @@ -2,11 +2,9 @@ package net.woggioni.rbcs.server.cache import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext -import io.netty.channel.DefaultFileRegion import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.codec.http.LastHttpContent import io.netty.handler.stream.ChunkedNioFile -import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.api.message.CacheMessage import net.woggioni.rbcs.api.message.CacheMessage.CacheContent import net.woggioni.rbcs.api.message.CacheMessage.CacheGetRequest diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt index a75524b..55aba66 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt @@ -1,7 +1,7 @@ package net.woggioni.rbcs.server.throttling -import net.woggioni.rbcs.api.Configuration import net.woggioni.jwo.Bucket +import net.woggioni.rbcs.api.Configuration import java.net.InetSocketAddress import java.util.Arrays import java.util.concurrent.ConcurrentHashMap diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt index 1302719..7fcddb3 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt @@ -8,12 +8,11 @@ import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion -import net.woggioni.rbcs.api.Configuration -import net.woggioni.rbcs.common.contextLogger -import net.woggioni.rbcs.server.RemoteBuildCacheServer import net.woggioni.jwo.Bucket import net.woggioni.jwo.LongMath +import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.common.createLogger +import net.woggioni.rbcs.server.RemoteBuildCacheServer import java.net.InetSocketAddress import java.time.Duration import java.time.temporal.ChronoUnit