From 953d68765164f4051c15034c411e910e2a62ce30 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 21 May 2026 06:58:17 +0800 Subject: [PATCH] optimized imports --- .../graal/GraalNativeImageConfiguration.kt | 4 +- .../rbcs/cli/RemoteBuildCacheServerCli.kt | 3 +- .../rbcs/client/RemoteBuildCacheClient.kt | 26 ++++----- .../kotlin/net/woggioni/rbcs/client/retry.kt | 2 +- .../net/woggioni/rbcs/client/RetryTest.kt | 4 +- .../rbcs/common/ByteBufInputStream.kt | 2 +- .../rbcs/common/ByteBufOutputStream.kt | 2 +- .../net/woggioni/rbcs/common/Logging.kt | 7 +-- .../kotlin/net/woggioni/rbcs/common/RBCS.kt | 15 +++-- .../kotlin/net/woggioni/rbcs/common/Xml.kt | 2 +- .../memcache/MemcacheCacheConfiguration.kt | 10 ++-- .../server/memcache/MemcacheCacheHandler.kt | 26 ++++----- .../server/memcache/client/MemcacheClient.kt | 10 ++-- .../server/memcache/client/ByteBufferTest.kt | 4 +- .../server/redis/RedisCacheConfiguration.kt | 12 ++-- .../rbcs/server/redis/RedisCacheHandler.kt | 22 ++++--- .../rbcs/server/redis/RedisCacheProvider.kt | 2 - .../rbcs/server/redis/client/RedisClient.kt | 14 ++--- .../rbcs/server/RemoteBuildCacheServer.kt | 58 ++++++++++++------- .../rbcs/server/auth/Authenticator.kt | 2 +- .../cache/FileSystemCacheConfiguration.kt | 4 +- .../server/cache/FileSystemCacheHandler.kt | 8 +-- .../cache/InMemoryCacheConfiguration.kt | 2 +- .../rbcs/server/cache/InMemoryCacheHandler.kt | 4 +- .../rbcs/server/exception/ExceptionHandler.kt | 9 ++- .../server/handler/ProxyProtocolHandler.kt | 4 +- .../rbcs/server/handler/ServerHandler.kt | 2 +- .../rbcs/server/handler/TraceHandler.kt | 2 +- .../server/throttling/ThrottlingHandler.kt | 10 ++-- .../rbcs/server/test/BasicAuthServerTest.kt | 2 +- .../NoAnonymousUserBasicAuthServerTest.kt | 2 +- .../test/NoAnonymousUserTlsServerTest.kt | 2 +- .../rbcs/server/test/NoAuthServerTest.kt | 2 +- .../rbcs/server/test/TlsServerTest.kt | 2 +- .../net/woggioni/rbcs/servlet/CacheServlet.kt | 14 ++--- 35 files changed, 155 insertions(+), 141 deletions(-) diff --git a/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt b/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt index a1099f6..91d43a4 100644 --- a/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt +++ b/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt @@ -7,6 +7,8 @@ import java.time.Duration import java.time.temporal.ChronoUnit import java.util.concurrent.ExecutionException import java.util.zip.Deflater +import net.woggioni.rbcs.client.Configuration as ClientConfiguration +import net.woggioni.rbcs.client.impl.Parser as ClientConfigurationParser import net.woggioni.jwo.NullOutputStream import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.Configuration.User @@ -16,8 +18,6 @@ import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand import net.woggioni.rbcs.cli.impl.commands.GetCommand import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand import net.woggioni.rbcs.cli.impl.commands.PutCommand -import net.woggioni.rbcs.client.Configuration as ClientConfiguration -import net.woggioni.rbcs.client.impl.Parser as ClientConfigurationParser import net.woggioni.rbcs.common.HostAndPort import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import net.woggioni.rbcs.common.RBCS 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 ce9dd61..cf36589 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 @@ -12,12 +12,11 @@ import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand import net.woggioni.rbcs.cli.impl.commands.PasswordHashCommand import net.woggioni.rbcs.cli.impl.commands.PutCommand import net.woggioni.rbcs.cli.impl.commands.ServerCommand +import net.woggioni.rbcs.common.RBCS.loadService import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory import net.woggioni.rbcs.common.createLogger import picocli.CommandLine import picocli.CommandLine.Model.CommandSpec -import java.util.ServiceLoader -import net.woggioni.rbcs.common.RBCS.loadService @CommandLine.Command( diff --git a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt index cac8d8a..4abed6e 100644 --- a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt @@ -1,5 +1,18 @@ package net.woggioni.rbcs.client +import java.io.IOException +import java.net.InetSocketAddress +import java.net.URI +import java.security.cert.X509Certificate +import java.util.Base64 +import java.util.concurrent.CompletableFuture +import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeoutException +import java.util.concurrent.atomic.AtomicInteger +import javax.net.ssl.TrustManagerFactory +import javax.net.ssl.X509TrustManager +import kotlin.random.Random +import io.netty.util.concurrent.Future as NettyFuture import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled @@ -34,20 +47,7 @@ import io.netty.handler.timeout.IdleState import io.netty.handler.timeout.IdleStateEvent import io.netty.handler.timeout.IdleStateHandler import io.netty.util.concurrent.Future -import io.netty.util.concurrent.Future as NettyFuture import io.netty.util.concurrent.GenericFutureListener -import java.io.IOException -import java.net.InetSocketAddress -import java.net.URI -import java.security.cert.X509Certificate -import java.util.Base64 -import java.util.concurrent.CompletableFuture -import java.util.concurrent.TimeUnit -import java.util.concurrent.TimeoutException -import java.util.concurrent.atomic.AtomicInteger -import javax.net.ssl.TrustManagerFactory -import javax.net.ssl.X509TrustManager -import kotlin.random.Random import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.common.RBCS.loadKeystore import net.woggioni.rbcs.common.createLogger diff --git a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt index f90b4ab..585e115 100644 --- a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt @@ -1,10 +1,10 @@ package net.woggioni.rbcs.client -import io.netty.util.concurrent.EventExecutorGroup import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit import kotlin.math.pow import kotlin.random.Random +import io.netty.util.concurrent.EventExecutorGroup sealed class OperationOutcome { class Success(val result: T) : OperationOutcome() diff --git a/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt b/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt index 7295ed1..63547f0 100644 --- a/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt +++ b/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt @@ -1,10 +1,10 @@ package net.woggioni.rbcs.client -import io.netty.util.concurrent.DefaultEventExecutorGroup -import io.netty.util.concurrent.EventExecutorGroup import java.util.concurrent.CompletableFuture import java.util.stream.Stream import kotlin.random.Random +import io.netty.util.concurrent.DefaultEventExecutorGroup +import io.netty.util.concurrent.EventExecutorGroup import net.woggioni.rbcs.common.contextLogger import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.extension.ExtensionContext diff --git a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt index 8d8ea77..6225b2e 100644 --- a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt @@ -1,7 +1,7 @@ package net.woggioni.rbcs.common -import io.netty.buffer.ByteBuf import java.io.InputStream +import io.netty.buffer.ByteBuf class ByteBufInputStream(private val buf : ByteBuf) : InputStream() { override fun read(): Int { diff --git a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt index 8cc131e..14b32cd 100644 --- a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt @@ -1,7 +1,7 @@ package net.woggioni.rbcs.common -import io.netty.buffer.ByteBuf import java.io.OutputStream +import io.netty.buffer.ByteBuf class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() { override fun write(b: Int) { 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 9c24152..3fc4622 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,13 +1,12 @@ package net.woggioni.rbcs.common -import io.netty.channel.Channel -import io.netty.channel.ChannelHandlerContext -import net.woggioni.jwo.LoggerController import java.nio.file.Files import java.nio.file.Path import java.util.logging.LogManager +import io.netty.channel.Channel +import io.netty.channel.ChannelHandlerContext +import net.woggioni.jwo.LoggerController import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.slf4j.MDC import org.slf4j.event.Level import org.slf4j.spi.LoggingEventBuilder diff --git a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt index 12e630b..342820b 100644 --- a/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt @@ -1,7 +1,5 @@ package net.woggioni.rbcs.common -import net.woggioni.jwo.JWO -import net.woggioni.jwo.Tuple2 import java.io.IOException import java.net.InetAddress import java.net.ServerSocket @@ -11,10 +9,19 @@ import java.nio.file.Files import java.nio.file.Path import java.security.KeyStore import java.security.MessageDigest -import java.security.cert.* -import java.util.* +import java.security.cert.CertPathValidator +import java.security.cert.CertPathValidatorException +import java.security.cert.CertificateException +import java.security.cert.CertificateFactory +import java.security.cert.PKIXParameters +import java.security.cert.PKIXRevocationChecker +import java.security.cert.X509Certificate +import java.util.EnumSet +import java.util.ServiceLoader import javax.net.ssl.TrustManagerFactory import javax.net.ssl.X509TrustManager +import net.woggioni.jwo.JWO +import net.woggioni.jwo.Tuple2 object RBCS { fun String.toUrl(): URL = URL.of(URI(this), null) 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 4963d60..2931730 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 @@ -16,13 +16,13 @@ import javax.xml.transform.stream.StreamResult import javax.xml.transform.stream.StreamSource import javax.xml.validation.Schema import javax.xml.validation.SchemaFactory +import org.xml.sax.ErrorHandler as ErrHandler import net.woggioni.jwo.JWO import org.slf4j.event.Level import org.w3c.dom.Document import org.w3c.dom.Element import org.w3c.dom.Node import org.w3c.dom.NodeList -import org.xml.sax.ErrorHandler as ErrHandler import org.xml.sax.SAXNotRecognizedException import org.xml.sax.SAXNotSupportedException import org.xml.sax.SAXParseException diff --git a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt index a789876..bac5250 100644 --- a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt @@ -1,15 +1,15 @@ package net.woggioni.rbcs.server.memcache -import io.netty.channel.ChannelFactory -import io.netty.channel.EventLoopGroup -import io.netty.channel.pool.FixedChannelPool -import io.netty.channel.socket.DatagramChannel -import io.netty.channel.socket.SocketChannel import java.time.Duration import java.util.concurrent.CompletableFuture import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference +import io.netty.channel.ChannelFactory +import io.netty.channel.EventLoopGroup +import io.netty.channel.pool.FixedChannelPool +import io.netty.channel.socket.DatagramChannel +import io.netty.channel.socket.SocketChannel import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.CacheHandlerFactory import net.woggioni.rbcs.api.Configuration diff --git a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheHandler.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheHandler.kt index d488eb1..22273fd 100644 --- a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheHandler.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheHandler.kt @@ -1,18 +1,5 @@ package net.woggioni.rbcs.server.memcache -import io.netty.buffer.ByteBuf -import io.netty.buffer.ByteBufAllocator -import io.netty.buffer.CompositeByteBuf -import io.netty.channel.Channel as NettyChannel -import io.netty.channel.ChannelHandlerContext -import io.netty.handler.codec.memcache.DefaultLastMemcacheContent -import io.netty.handler.codec.memcache.DefaultMemcacheContent -import io.netty.handler.codec.memcache.LastMemcacheContent -import io.netty.handler.codec.memcache.MemcacheContent -import io.netty.handler.codec.memcache.binary.BinaryMemcacheOpcodes -import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponse -import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponseStatus -import io.netty.handler.codec.memcache.binary.DefaultBinaryMemcacheRequest import java.io.ByteArrayOutputStream import java.io.ObjectInputStream import java.io.ObjectOutputStream @@ -28,6 +15,19 @@ import java.util.concurrent.CompletableFuture import java.util.zip.Deflater import java.util.zip.DeflaterOutputStream import java.util.zip.InflaterOutputStream +import io.netty.channel.Channel as NettyChannel +import io.netty.buffer.ByteBuf +import io.netty.buffer.ByteBufAllocator +import io.netty.buffer.CompositeByteBuf +import io.netty.channel.ChannelHandlerContext +import io.netty.handler.codec.memcache.DefaultLastMemcacheContent +import io.netty.handler.codec.memcache.DefaultMemcacheContent +import io.netty.handler.codec.memcache.LastMemcacheContent +import io.netty.handler.codec.memcache.MemcacheContent +import io.netty.handler.codec.memcache.binary.BinaryMemcacheOpcodes +import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponse +import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponseStatus +import io.netty.handler.codec.memcache.binary.DefaultBinaryMemcacheRequest import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.api.exception.ContentTooLargeException diff --git a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt index 07e37ab..7899b4e 100644 --- a/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt @@ -1,6 +1,11 @@ package net.woggioni.rbcs.server.memcache.client +import java.io.IOException +import java.net.InetSocketAddress +import java.util.concurrent.CompletableFuture +import java.util.concurrent.ConcurrentHashMap +import io.netty.util.concurrent.Future as NettyFuture import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBuf import io.netty.channel.Channel @@ -20,12 +25,7 @@ import io.netty.handler.codec.memcache.MemcacheObject import io.netty.handler.codec.memcache.binary.BinaryMemcacheClientCodec import io.netty.handler.codec.memcache.binary.BinaryMemcacheRequest import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponse -import io.netty.util.concurrent.Future as NettyFuture import io.netty.util.concurrent.GenericFutureListener -import java.io.IOException -import java.net.InetSocketAddress -import java.util.concurrent.CompletableFuture -import java.util.concurrent.ConcurrentHashMap import net.woggioni.rbcs.common.HostAndPort import net.woggioni.rbcs.common.createLogger import net.woggioni.rbcs.common.trace diff --git a/rbcs-server-memcache/src/test/kotlin/net/woggioni/rbcs/server/memcache/client/ByteBufferTest.kt b/rbcs-server-memcache/src/test/kotlin/net/woggioni/rbcs/server/memcache/client/ByteBufferTest.kt index 21df339..d1f0604 100644 --- a/rbcs-server-memcache/src/test/kotlin/net/woggioni/rbcs/server/memcache/client/ByteBufferTest.kt +++ b/rbcs-server-memcache/src/test/kotlin/net/woggioni/rbcs/server/memcache/client/ByteBufferTest.kt @@ -1,11 +1,11 @@ package net.woggioni.rbcs.server.memcache.client -import io.netty.buffer.ByteBufUtil -import io.netty.buffer.Unpooled import java.io.ByteArrayInputStream import java.nio.ByteBuffer import java.nio.channels.Channels import kotlin.random.Random +import io.netty.buffer.ByteBufUtil +import io.netty.buffer.Unpooled import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheConfiguration.kt b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheConfiguration.kt index 3b25bde..e556484 100644 --- a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheConfiguration.kt +++ b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheConfiguration.kt @@ -1,17 +1,15 @@ package net.woggioni.rbcs.server.redis -import io.netty.channel.ChannelFactory -import io.netty.channel.EventLoopGroup -import io.netty.channel.pool.FixedChannelPool -import io.netty.channel.socket.DatagramChannel -import io.netty.channel.socket.SocketChannel - import java.time.Duration import java.util.concurrent.CompletableFuture import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference - +import io.netty.channel.ChannelFactory +import io.netty.channel.EventLoopGroup +import io.netty.channel.pool.FixedChannelPool +import io.netty.channel.socket.DatagramChannel +import io.netty.channel.socket.SocketChannel import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.CacheHandlerFactory import net.woggioni.rbcs.api.Configuration diff --git a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheHandler.kt b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheHandler.kt index 584dd7f..1e9299e 100644 --- a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheHandler.kt +++ b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheHandler.kt @@ -1,16 +1,5 @@ package net.woggioni.rbcs.server.redis -import io.netty.buffer.ByteBuf -import io.netty.buffer.ByteBufAllocator -import io.netty.buffer.CompositeByteBuf -import io.netty.channel.Channel as NettyChannel -import io.netty.channel.ChannelHandlerContext -import io.netty.handler.codec.redis.ArrayRedisMessage -import io.netty.handler.codec.redis.ErrorRedisMessage -import io.netty.handler.codec.redis.FullBulkStringRedisMessage -import io.netty.handler.codec.redis.RedisMessage -import io.netty.handler.codec.redis.SimpleStringRedisMessage - import java.io.ByteArrayOutputStream import java.io.ObjectInputStream import java.io.ObjectOutputStream @@ -25,7 +14,16 @@ import java.time.Duration import java.util.zip.Deflater import java.util.zip.DeflaterOutputStream import java.util.zip.InflaterOutputStream - +import io.netty.channel.Channel as NettyChannel +import io.netty.buffer.ByteBuf +import io.netty.buffer.ByteBufAllocator +import io.netty.buffer.CompositeByteBuf +import io.netty.channel.ChannelHandlerContext +import io.netty.handler.codec.redis.ArrayRedisMessage +import io.netty.handler.codec.redis.ErrorRedisMessage +import io.netty.handler.codec.redis.FullBulkStringRedisMessage +import io.netty.handler.codec.redis.RedisMessage +import io.netty.handler.codec.redis.SimpleStringRedisMessage import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.api.exception.ContentTooLargeException diff --git a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheProvider.kt b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheProvider.kt index bc4a5b8..0285607 100644 --- a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheProvider.kt +++ b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/RedisCacheProvider.kt @@ -2,7 +2,6 @@ package net.woggioni.rbcs.server.redis import java.time.Duration import java.time.temporal.ChronoUnit - import net.woggioni.rbcs.api.CacheProvider import net.woggioni.rbcs.api.exception.ConfigurationException import net.woggioni.rbcs.common.HostAndPort @@ -10,7 +9,6 @@ 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 - import org.w3c.dom.Document import org.w3c.dom.Element diff --git a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/client/RedisClient.kt b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/client/RedisClient.kt index d683377..e700d04 100644 --- a/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/client/RedisClient.kt +++ b/rbcs-server-redis/src/main/kotlin/net/woggioni/rbcs/server/redis/client/RedisClient.kt @@ -1,5 +1,11 @@ package net.woggioni.rbcs.server.redis.client +import java.io.IOException +import java.net.InetSocketAddress +import java.nio.charset.StandardCharsets +import java.util.concurrent.CompletableFuture +import java.util.concurrent.ConcurrentHashMap +import io.netty.util.concurrent.Future as NettyFuture import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBufAllocator import io.netty.buffer.Unpooled @@ -22,15 +28,7 @@ import io.netty.handler.codec.redis.RedisBulkStringAggregator import io.netty.handler.codec.redis.RedisDecoder import io.netty.handler.codec.redis.RedisEncoder import io.netty.handler.codec.redis.RedisMessage -import io.netty.util.concurrent.Future as NettyFuture import io.netty.util.concurrent.GenericFutureListener - -import java.io.IOException -import java.net.InetSocketAddress -import java.nio.charset.StandardCharsets -import java.util.concurrent.CompletableFuture -import java.util.concurrent.ConcurrentHashMap - import net.woggioni.rbcs.common.HostAndPort import net.woggioni.rbcs.common.createLogger import net.woggioni.rbcs.common.trace diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt index a714e55..4484d82 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt @@ -1,9 +1,35 @@ package net.woggioni.rbcs.server +import java.io.OutputStream +import java.net.InetSocketAddress +import java.nio.file.Files +import java.nio.file.Path +import java.security.PrivateKey +import java.security.cert.X509Certificate +import java.time.Duration +import java.time.Instant +import java.util.Arrays +import java.util.Base64 +import java.util.concurrent.CompletableFuture +import java.util.concurrent.Future +import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeoutException +import java.util.regex.Matcher +import java.util.regex.Pattern +import javax.naming.ldap.LdapName +import javax.net.ssl.SSLPeerUnverifiedException import io.netty.bootstrap.ServerBootstrap import io.netty.buffer.ByteBuf -import io.netty.channel.* +import io.netty.channel.Channel +import io.netty.channel.ChannelFactory +import io.netty.channel.ChannelFuture import io.netty.channel.ChannelHandler.Sharable +import io.netty.channel.ChannelHandlerContext +import io.netty.channel.ChannelInboundHandlerAdapter +import io.netty.channel.ChannelInitializer +import io.netty.channel.ChannelOption +import io.netty.channel.ChannelPromise +import io.netty.channel.MultiThreadIoEventLoopGroup import io.netty.channel.nio.NioIoHandler import io.netty.channel.socket.DatagramChannel import io.netty.channel.socket.ServerSocketChannel @@ -13,7 +39,12 @@ import io.netty.channel.socket.nio.NioServerSocketChannel import io.netty.channel.socket.nio.NioSocketChannel import io.netty.handler.codec.compression.CompressionOptions import io.netty.handler.codec.haproxy.HAProxyMessageDecoder -import io.netty.handler.codec.http.* +import io.netty.handler.codec.http.DefaultHttpContent +import io.netty.handler.codec.http.HttpContentCompressor +import io.netty.handler.codec.http.HttpDecoderConfig +import io.netty.handler.codec.http.HttpHeaderNames +import io.netty.handler.codec.http.HttpRequest +import io.netty.handler.codec.http.HttpServerCodec import io.netty.handler.ssl.ClientAuth import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder @@ -28,13 +59,17 @@ import net.woggioni.rbcs.api.AsyncCloseable import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.TelemetryController import net.woggioni.rbcs.api.exception.ConfigurationException -import net.woggioni.rbcs.common.* +import net.woggioni.rbcs.common.Cidr import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import net.woggioni.rbcs.common.RBCS.getTrustManager import net.woggioni.rbcs.common.RBCS.loadKeystore import net.woggioni.rbcs.common.RBCS.loadService import net.woggioni.rbcs.common.RBCS.toUrl +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.createLogger +import net.woggioni.rbcs.common.debug +import net.woggioni.rbcs.common.info import net.woggioni.rbcs.server.auth.AbstractNettyHttpAuthenticator import net.woggioni.rbcs.server.auth.Authorizer import net.woggioni.rbcs.server.auth.RoleAuthorizer @@ -47,23 +82,6 @@ import net.woggioni.rbcs.server.handler.ReadTriggerDuplexHandler import net.woggioni.rbcs.server.handler.ServerHandler import net.woggioni.rbcs.server.throttling.BucketManager import net.woggioni.rbcs.server.throttling.ThrottlingHandler -import java.io.OutputStream -import java.net.InetSocketAddress -import java.nio.file.Files -import java.nio.file.Path -import java.security.PrivateKey -import java.security.cert.X509Certificate -import java.time.Duration -import java.time.Instant -import java.util.* -import java.util.concurrent.CompletableFuture -import java.util.concurrent.Future -import java.util.concurrent.TimeUnit -import java.util.concurrent.TimeoutException -import java.util.regex.Matcher -import java.util.regex.Pattern -import javax.naming.ldap.LdapName -import javax.net.ssl.SSLPeerUnverifiedException class RemoteBuildCacheServer(private val cfg: Configuration) { diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt index 202551e..e23bd81 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt @@ -1,5 +1,6 @@ package net.woggioni.rbcs.server.auth +import java.net.InetSocketAddress import io.netty.buffer.Unpooled import io.netty.channel.ChannelFutureListener import io.netty.channel.ChannelHandlerContext @@ -12,7 +13,6 @@ import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.netty.util.ReferenceCountUtil -import java.net.InetSocketAddress import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.Configuration.Group import net.woggioni.rbcs.api.Role diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt index 9a867c8..7903106 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt @@ -1,11 +1,11 @@ package net.woggioni.rbcs.server.cache +import java.nio.file.Path +import java.time.Duration import io.netty.channel.ChannelFactory import io.netty.channel.EventLoopGroup import io.netty.channel.socket.DatagramChannel import io.netty.channel.socket.SocketChannel -import java.nio.file.Path -import java.time.Duration import net.woggioni.jwo.Application import net.woggioni.rbcs.api.CacheHandlerFactory import net.woggioni.rbcs.api.Configuration 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 ea6ee09..d6b2993 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 @@ -1,14 +1,14 @@ package net.woggioni.rbcs.server.cache -import io.netty.buffer.ByteBuf -import io.netty.channel.ChannelHandlerContext -import io.netty.handler.codec.http.LastHttpContent -import io.netty.handler.stream.ChunkedNioFile import java.nio.channels.Channels import java.util.Base64 import java.util.zip.Deflater import java.util.zip.DeflaterOutputStream import java.util.zip.InflaterInputStream +import io.netty.buffer.ByteBuf +import io.netty.channel.ChannelHandlerContext +import io.netty.handler.codec.http.LastHttpContent +import io.netty.handler.stream.ChunkedNioFile import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.message.CacheMessage import net.woggioni.rbcs.api.message.CacheMessage.CacheContent diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt index 99491f7..a456167 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt @@ -1,10 +1,10 @@ package net.woggioni.rbcs.server.cache +import java.time.Duration import io.netty.channel.ChannelFactory import io.netty.channel.EventLoopGroup import io.netty.channel.socket.DatagramChannel import io.netty.channel.socket.SocketChannel -import java.time.Duration import net.woggioni.rbcs.api.CacheHandlerFactory import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.common.RBCS diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheHandler.kt index 3a4d37d..ae81a36 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheHandler.kt @@ -1,10 +1,10 @@ package net.woggioni.rbcs.server.cache -import io.netty.buffer.ByteBuf -import io.netty.channel.ChannelHandlerContext import java.util.zip.Deflater import java.util.zip.DeflaterOutputStream import java.util.zip.InflaterOutputStream +import io.netty.buffer.ByteBuf +import io.netty.channel.ChannelHandlerContext import net.woggioni.rbcs.api.CacheHandler import net.woggioni.rbcs.api.message.CacheMessage import net.woggioni.rbcs.api.message.CacheMessage.CacheContent diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt index 0553952..ff18071 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt @@ -1,5 +1,9 @@ package net.woggioni.rbcs.server.exception +import java.net.ConnectException +import java.net.SocketException +import javax.net.ssl.SSLException +import javax.net.ssl.SSLPeerUnverifiedException import io.netty.buffer.Unpooled import io.netty.channel.ChannelDuplexHandler import io.netty.channel.ChannelFutureListener @@ -13,16 +17,11 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.netty.handler.timeout.ReadTimeoutException import io.netty.handler.timeout.WriteTimeoutException -import java.net.ConnectException -import java.net.SocketException -import javax.net.ssl.SSLException -import javax.net.ssl.SSLPeerUnverifiedException import net.woggioni.rbcs.api.exception.CacheException import net.woggioni.rbcs.api.exception.ContentTooLargeException import net.woggioni.rbcs.common.contextLogger import net.woggioni.rbcs.common.debug import net.woggioni.rbcs.common.log -import net.woggioni.rbcs.server.RemoteBuildCacheServer import org.slf4j.event.Level import org.slf4j.spi.LoggingEventBuilder diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ProxyProtocolHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ProxyProtocolHandler.kt index 0a9860f..6a733c0 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ProxyProtocolHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ProxyProtocolHandler.kt @@ -1,10 +1,10 @@ package net.woggioni.rbcs.server.handler +import java.net.InetAddress +import java.net.InetSocketAddress import io.netty.channel.ChannelHandlerContext import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.codec.haproxy.HAProxyMessage -import java.net.InetAddress -import java.net.InetSocketAddress import net.woggioni.rbcs.common.Cidr import net.woggioni.rbcs.common.createLogger import net.woggioni.rbcs.common.trace diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt index 48ca18c..90e8485 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt @@ -1,5 +1,6 @@ package net.woggioni.rbcs.server.handler +import java.nio.file.Path import io.netty.channel.ChannelDuplexHandler import io.netty.channel.ChannelHandler import io.netty.channel.ChannelHandlerContext @@ -18,7 +19,6 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpUtil import io.netty.handler.codec.http.HttpVersion import io.netty.handler.codec.http.LastHttpContent -import java.nio.file.Path import net.woggioni.rbcs.api.CacheValueMetadata import net.woggioni.rbcs.api.message.CacheMessage import net.woggioni.rbcs.api.message.CacheMessage.CacheContent diff --git a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/TraceHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/TraceHandler.kt index 35f197f..078aae1 100644 --- a/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/TraceHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/TraceHandler.kt @@ -1,5 +1,6 @@ package net.woggioni.rbcs.server.handler +import java.nio.file.Path import io.netty.channel.ChannelHandler.Sharable import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelInboundHandlerAdapter @@ -10,7 +11,6 @@ import io.netty.handler.codec.http.HttpHeaderValues import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.LastHttpContent -import java.nio.file.Path @Sharable object TraceHandler : ChannelInboundHandlerAdapter() { 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 1a695de..5809ca9 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 @@ -1,5 +1,10 @@ package net.woggioni.rbcs.server.throttling +import java.net.InetSocketAddress +import java.time.Duration +import java.time.temporal.ChronoUnit +import java.util.ArrayDeque +import java.util.concurrent.TimeUnit import io.netty.buffer.ByteBufHolder import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelInboundHandlerAdapter @@ -10,11 +15,6 @@ import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.netty.handler.codec.http.LastHttpContent -import java.net.InetSocketAddress -import java.time.Duration -import java.time.temporal.ChronoUnit -import java.util.ArrayDeque -import java.util.concurrent.TimeUnit import net.woggioni.jwo.Bucket import net.woggioni.jwo.LongMath import net.woggioni.rbcs.api.Configuration diff --git a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt index 316455c..fb15cc3 100644 --- a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt @@ -1,11 +1,11 @@ package net.woggioni.rbcs.server.test -import io.netty.handler.codec.http.HttpResponseStatus import java.net.http.HttpClient import java.net.http.HttpRequest import java.net.http.HttpResponse import java.time.Duration import java.time.temporal.ChronoUnit +import io.netty.handler.codec.http.HttpResponseStatus import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.Role import net.woggioni.rbcs.common.PasswordSecurity.hashPassword diff --git a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt index f4e59f6..8ad7d3b 100644 --- a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt @@ -1,9 +1,9 @@ package net.woggioni.rbcs.server.test -import io.netty.handler.codec.http.HttpResponseStatus import java.net.http.HttpClient import java.net.http.HttpRequest import java.net.http.HttpResponse +import io.netty.handler.codec.http.HttpResponseStatus import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import org.junit.jupiter.api.Assertions diff --git a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt index a0fbd2f..145b81b 100644 --- a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt @@ -1,9 +1,9 @@ package net.woggioni.rbcs.server.test -import io.netty.handler.codec.http.HttpResponseStatus import java.net.http.HttpClient import java.net.http.HttpRequest import java.net.http.HttpResponse +import io.netty.handler.codec.http.HttpResponseStatus import net.woggioni.rbcs.api.Configuration import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order diff --git a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt index c98a1f3..f409cdf 100644 --- a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt @@ -1,6 +1,5 @@ package net.woggioni.rbcs.server.test -import io.netty.handler.codec.http.HttpResponseStatus import java.net.URI import java.net.http.HttpClient import java.net.http.HttpRequest @@ -11,6 +10,7 @@ import java.time.temporal.ChronoUnit import java.util.Base64 import java.util.zip.Deflater import kotlin.random.Random +import io.netty.handler.codec.http.HttpResponseStatus import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.common.RBCS.getFreePort import net.woggioni.rbcs.common.Xml diff --git a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt index 2ac8315..c66c2c2 100644 --- a/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt @@ -1,9 +1,9 @@ package net.woggioni.rbcs.server.test -import io.netty.handler.codec.http.HttpResponseStatus import java.net.http.HttpClient import java.net.http.HttpRequest import java.net.http.HttpResponse +import io.netty.handler.codec.http.HttpResponseStatus import net.woggioni.rbcs.api.Configuration import net.woggioni.rbcs.api.Role import org.bouncycastle.asn1.x500.X500Name diff --git a/rbcs-servlet/src/main/kotlin/net/woggioni/rbcs/servlet/CacheServlet.kt b/rbcs-servlet/src/main/kotlin/net/woggioni/rbcs/servlet/CacheServlet.kt index bd5713a..90adef4 100644 --- a/rbcs-servlet/src/main/kotlin/net/woggioni/rbcs/servlet/CacheServlet.kt +++ b/rbcs-servlet/src/main/kotlin/net/woggioni/rbcs/servlet/CacheServlet.kt @@ -1,12 +1,5 @@ package net.woggioni.rbcs.servlet -import jakarta.annotation.PreDestroy -import jakarta.enterprise.context.ApplicationScoped -import jakarta.inject.Inject -import jakarta.servlet.annotation.WebServlet -import jakarta.servlet.http.HttpServlet -import jakarta.servlet.http.HttpServletRequest -import jakarta.servlet.http.HttpServletResponse import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.nio.file.Path @@ -17,6 +10,13 @@ import java.util.concurrent.PriorityBlockingQueue import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong import java.util.logging.Logger +import jakarta.annotation.PreDestroy +import jakarta.enterprise.context.ApplicationScoped +import jakarta.inject.Inject +import jakarta.servlet.annotation.WebServlet +import jakarta.servlet.http.HttpServlet +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import net.woggioni.jwo.HttpClient.HttpStatus import net.woggioni.jwo.JWO