0.1.6 release

.gitea/workflows/build.yaml

@@ -31,7 +31,7 @@ jobs:
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build gbcs Docker image
+        name: Build rbcs Docker image
         uses: docker/build-push-action@v5.3.0
         with:
           context: "docker/build/docker"
@@ -39,12 +39,12 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/gbcs:latest
-            gitea.woggioni.net/woggioni/gbcs:${{ steps.retrieve-version.outputs.VERSION }}
+            gitea.woggioni.net/woggioni/rbcs:latest
+            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
           target: release
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
       -
-        name: Build gbcs memcache Docker image
+        name: Build rbcs memcache Docker image
         uses: docker/build-push-action@v5.3.0
         with:
           context: "docker/build/docker"
@@ -52,11 +52,11 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/gbcs:memcache
-            gitea.woggioni.net/woggioni/gbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
+            gitea.woggioni.net/woggioni/rbcs:memcache
+            gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
           target: release-memcache
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/rbcs:buildx
       - name: Publish artifacts
         env:
           PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}

.gitignore

@@ -4,4 +4,4 @@
 # Ignore Gradle build output directory
 build
 
-gbcs-cli/native-image/*.json
+rbcs-cli/native-image/*.json

build.gradle

@@ -15,7 +15,7 @@ allprojects { subproject ->
             version = project.currentTag.map { it[0] }.get()
         } else {
             version = project.gitRevision.map { gitRevision ->
-                "${getProperty('gbcs.version')}.${gitRevision[0..10]}"
+                "${getProperty('rbcs.version')}.${gitRevision[0..10]}"
             }.get()
         }
 

docker/Dockerfile

@@ -4,13 +4,13 @@ USER luser
 WORKDIR /home/luser
 
 FROM base-release AS release
-ADD gbcs-cli-envelope-*.jar gbcs.jar
-ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/gbcs.jar", "server"]
+ADD rbcs-cli-envelope-*.jar rbcs.jar
+ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"]
 
 FROM base-release AS release-memcache
-ADD --chown=luser:luser gbcs-cli-envelope-*.jar gbcs.jar
+ADD --chown=luser:luser rbcs-cli-envelope-*.jar rbcs.jar
 RUN mkdir plugins
 WORKDIR /home/luser/plugins
-RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/gbcs-server-memcache*.tar
+RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
 WORKDIR /home/luser
-ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/gbcs.jar", "server"]
+ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"]

docker/build.gradle

@@ -18,8 +18,8 @@ configurations {
 }
 
 dependencies {
-    docker project(path: ':gbcs-cli', configuration: 'release')
-    docker project(path: ':gbcs-server-memcache', configuration: 'release')
+    docker project(path: ':rbcs-cli', configuration: 'release')
+    docker project(path: ':rbcs-server-memcache', configuration: 'release')
 }
 
 Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
@@ -35,21 +35,21 @@ Provider<Copy> prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) {
 Provider<DockerBuildImage> dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) {
     group = 'docker'
     dependsOn prepareDockerBuild
-    images.add('gitea.woggioni.net/woggioni/gbcs:latest')
-    images.add("gitea.woggioni.net/woggioni/gbcs:${version}")
+    images.add('gitea.woggioni.net/woggioni/rbcs:latest')
+    images.add("gitea.woggioni.net/woggioni/rbcs:${version}")
 }
 
 Provider<DockerTagImage> dockerTag = tasks.register('dockerTagImage', DockerTagImage) {
     group = 'docker'
-    repository = 'gitea.woggioni.net/woggioni/gbcs'
-    imageId = 'gitea.woggioni.net/woggioni/gbcs:latest'
+    repository = 'gitea.woggioni.net/woggioni/rbcs'
+    imageId = 'gitea.woggioni.net/woggioni/rbcs:latest'
     tag = version
 }
 
 Provider<DockerTagImage> dockerTagMemcache = tasks.register('dockerTagMemcacheImage', DockerTagImage) {
     group = 'docker'
-    repository = 'gitea.woggioni.net/woggioni/gbcs'
-    imageId = 'gitea.woggioni.net/woggioni/gbcs:memcache'
+    repository = 'gitea.woggioni.net/woggioni/rbcs'
+    imageId = 'gitea.woggioni.net/woggioni/rbcs:memcache'
     tag = "${version}-memcache"
 }
 

gbcs-api/src/main/java/module-info.java

@@ -1,7 +0,0 @@
-module net.woggioni.gbcs.api {
-    requires static lombok;
-    requires java.xml;
-    requires io.netty.buffer;
-    exports net.woggioni.gbcs.api;
-    exports net.woggioni.gbcs.api.exception;
-}

gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/GbcsException.java

@@ -1,7 +0,0 @@
-package net.woggioni.gbcs.api.exception;
-
-public class GbcsException extends RuntimeException {
-    public GbcsException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

gbcs-cli/src/main/java/module-info.java

@@ -1,17 +0,0 @@
-module net.woggioni.gbcs.cli {
-    requires org.slf4j;
-    requires net.woggioni.gbcs.server;
-    requires info.picocli;
-    requires net.woggioni.gbcs.common;
-    requires net.woggioni.gbcs.client;
-    requires kotlin.stdlib;
-    requires net.woggioni.jwo;
-    requires net.woggioni.gbcs.api;
-
-    exports net.woggioni.gbcs.cli.impl.converters to info.picocli;
-    opens net.woggioni.gbcs.cli.impl.commands to info.picocli;
-    opens net.woggioni.gbcs.cli.impl to info.picocli;
-    opens net.woggioni.gbcs.cli to info.picocli, net.woggioni.gbcs.common;
-
-    exports net.woggioni.gbcs.cli;
-}

gbcs-client/src/test/resources/net/woggioni/gbcs/client/test/gbcs-client.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs-client:profiles xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-                      xmlns:gbcs-client="urn:net.woggioni.gbcs.client"
-                      xs:schemaLocation="urn:net.woggioni.gbcs.client jms://net.woggioni.gbcs.client/net/woggioni/gbcs/client/schema/gbcs-client.xsd"
-                      >
-    <profile name="profile1" base-url="https://gbcs1.example.com/">
-        <tls-client-auth
-                key-store-file="keystore.pfx"
-                key-store-password="password"
-                key-alias="woggioni@c962475fa38"
-                key-password="key-password"/>
-    </profile>
-    <profile name="profile2" base-url="https://gbcs2.example.com/">
-        <basic-auth user="user" password="password"/>
-    </profile>
-</gbcs-client:profiles>

gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GBCS.kt

@@ -1,29 +0,0 @@
-package net.woggioni.gbcs.common
-
-import net.woggioni.jwo.JWO
-import java.net.URI
-import java.net.URL
-import java.security.MessageDigest
-
-object GBCS {
-    fun String.toUrl() : URL = URL.of(URI(this), null)
-
-    const val GBCS_NAMESPACE_URI: String = "urn:net.woggioni.gbcs.server"
-    const val GBCS_PREFIX: String = "gbcs"
-    const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"
-
-    fun digest(
-        data: ByteArray,
-        md: MessageDigest = MessageDigest.getInstance("MD5")
-    ): ByteArray {
-        md.update(data)
-        return md.digest()
-    }
-
-    fun digestString(
-        data: ByteArray,
-        md: MessageDigest = MessageDigest.getInstance("MD5")
-    ): String {
-        return JWO.bytesToHex(digest(data, md))
-    }
-}

gbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider

@@ -1 +0,0 @@
-net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory

gbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider

@@ -1 +0,0 @@
-net.woggioni.gbcs.server.memcache.MemcacheCacheProvider

gbcs-server/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider

@@ -1,2 +0,0 @@
-net.woggioni.gbcs.server.cache.FileSystemCacheProvider
-net.woggioni.gbcs.server.cache.InMemoryCacheProvider

gradle.properties

@@ -2,11 +2,10 @@ org.gradle.configuration-cache=false
 org.gradle.parallel=true
 org.gradle.caching=true
 
-gbcs.version = 0.1.3
+rbcs.version = 0.1.6
 
-lys.version = 2025.02.05
+lys.version = 2025.02.08
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net
 
-jpms-check.configurationName = runtimeClasspath

rbcs-api/src/main/java/module-info.java

@@ -0,0 +1,7 @@
+module net.woggioni.rbcs.api {
+    requires static lombok;
+    requires java.xml;
+    requires io.netty.buffer;
+    exports net.woggioni.rbcs.api;
+    exports net.woggioni.rbcs.api.exception;
+}

rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.api;
+package net.woggioni.rbcs.api;
 
 import io.netty.buffer.ByteBuf;
-import net.woggioni.gbcs.api.exception.ContentTooLargeException;
+import net.woggioni.rbcs.api.exception.ContentTooLargeException;
 
 import java.nio.channels.ReadableByteChannel;
 import java.util.concurrent.CompletableFuture;

rbcs-api/src/main/java/net/woggioni/rbcs/api/CacheProvider.java

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.api;
+package net.woggioni.rbcs.api;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.api;
+package net.woggioni.rbcs.api;
 
 
 import lombok.EqualsAndHashCode;
@@ -135,7 +135,7 @@ public class Configuration {
     }
 
     public interface Cache {
-        net.woggioni.gbcs.api.Cache materialize();
+        net.woggioni.rbcs.api.Cache materialize();
         String getNamespaceURI();
         String getTypeName();
     }

rbcs-api/src/main/java/net/woggioni/rbcs/api/Role.java

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.api;
+package net.woggioni.rbcs.api;
 
 public enum Role {
     Reader, Writer

rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/CacheException.java

@@ -1,6 +1,6 @@
-package net.woggioni.gbcs.api.exception;
+package net.woggioni.rbcs.api.exception;
 
-public class CacheException extends GbcsException {
+public class CacheException extends RbcsException {
     public CacheException(String message, Throwable cause) {
         super(message, cause);
     }

rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ConfigurationException.java

@@ -1,6 +1,6 @@
-package net.woggioni.gbcs.api.exception;
+package net.woggioni.rbcs.api.exception;
 
-public class ConfigurationException extends GbcsException {
+public class ConfigurationException extends RbcsException {
     public ConfigurationException(String message, Throwable cause) {
         super(message, cause);
     }

rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ContentTooLargeException.java

@@ -1,6 +1,6 @@
-package net.woggioni.gbcs.api.exception;
+package net.woggioni.rbcs.api.exception;
 
-public class ContentTooLargeException extends GbcsException {
+public class ContentTooLargeException extends RbcsException {
     public ContentTooLargeException(String message, Throwable cause) {
         super(message, cause);
     }

rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/RbcsException.java

@@ -0,0 +1,7 @@
+package net.woggioni.rbcs.api.exception;
+
+public class RbcsException extends RuntimeException {
+    public RbcsException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

rbcs-cli/build.gradle

@@ -17,9 +17,9 @@ import net.woggioni.gradle.graalvm.JlinkPlugin
 import net.woggioni.gradle.graalvm.JlinkTask
 
 Property<String> mainModuleName = objects.property(String.class)
-mainModuleName.set('net.woggioni.gbcs.cli')
+mainModuleName.set('net.woggioni.rbcs.cli')
 Property<String> mainClassName = objects.property(String.class)
-mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli')
+mainClassName.set('net.woggioni.rbcs.cli.RemoteBuildCacheServerCli')
 
 tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
     options.javaModuleMainClass = mainClassName
@@ -44,11 +44,10 @@ envelopeJar {
 dependencies {
     implementation catalog.jwo
     implementation catalog.slf4j.api
-    implementation catalog.netty.codec.http
     implementation catalog.picocli
 
-    implementation project(':gbcs-client')
-    implementation project(':gbcs-server')
+    implementation project(':rbcs-client')
+    implementation project(':rbcs-server')
 
 //    runtimeOnly catalog.slf4j.jdk14
     runtimeOnly catalog.logback.classic
@@ -56,10 +55,10 @@ dependencies {
 }
 
 Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {
-//    systemProperties['java.util.logging.config.class'] = 'net.woggioni.gbcs.LoggingConfig'
-//    systemProperties['log.config.source'] = 'net/woggioni/gbcs/cli/logging.properties'
-//    systemProperties['java.util.logging.config.file'] = 'classpath:net/woggioni/gbcs/cli/logging.properties'
-    systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/gbcs/cli/logback.xml'
+//    systemProperties['java.util.logging.config.class'] = 'net.woggioni.rbcs.LoggingConfig'
+//    systemProperties['log.config.source'] = 'net/woggioni/rbcs/cli/logging.properties'
+//    systemProperties['java.util.logging.config.file'] = 'classpath:net/woggioni/rbcs/cli/logging.properties'
+    systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/rbcs/cli/logback.xml'
     systemProperties['io.netty.leakDetectionLevel'] = 'DISABLED'
 
 //    systemProperties['org.slf4j.simpleLogger.showDateTime'] = 'true'
@@ -83,7 +82,7 @@ tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
 
 tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
     mainClass = mainClassName
-    mainModule = 'net.woggioni.gbcs.cli'
+    mainModule = 'net.woggioni.rbcs.cli'
 }
 
 artifacts {

rbcs-cli/src/main/java/module-info.java

@@ -0,0 +1,17 @@
+module net.woggioni.rbcs.cli {
+    requires org.slf4j;
+    requires net.woggioni.rbcs.server;
+    requires info.picocli;
+    requires net.woggioni.rbcs.common;
+    requires net.woggioni.rbcs.client;
+    requires kotlin.stdlib;
+    requires net.woggioni.jwo;
+    requires net.woggioni.rbcs.api;
+
+    exports net.woggioni.rbcs.cli.impl.converters to info.picocli;
+    opens net.woggioni.rbcs.cli.impl.commands to info.picocli;
+    opens net.woggioni.rbcs.cli.impl to info.picocli;
+    opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common;
+
+    exports net.woggioni.rbcs.cli;
+}

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt

@@ -1,43 +1,43 @@
-package net.woggioni.gbcs.cli
+package net.woggioni.rbcs.cli
 
-import net.woggioni.gbcs.cli.impl.AbstractVersionProvider
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.cli.impl.commands.BenchmarkCommand
-import net.woggioni.gbcs.cli.impl.commands.ClientCommand
-import net.woggioni.gbcs.cli.impl.commands.GetCommand
-import net.woggioni.gbcs.cli.impl.commands.HealthCheckCommand
-import net.woggioni.gbcs.cli.impl.commands.PasswordHashCommand
-import net.woggioni.gbcs.cli.impl.commands.PutCommand
-import net.woggioni.gbcs.cli.impl.commands.ServerCommand
-import net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory
-import net.woggioni.gbcs.common.contextLogger
+import net.woggioni.rbcs.cli.impl.AbstractVersionProvider
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
+import net.woggioni.rbcs.cli.impl.commands.ClientCommand
+import net.woggioni.rbcs.cli.impl.commands.GetCommand
+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.RbcsUrlStreamHandlerFactory
+import net.woggioni.rbcs.common.contextLogger
 import net.woggioni.jwo.Application
 import picocli.CommandLine
 import picocli.CommandLine.Model.CommandSpec
 
 
 @CommandLine.Command(
-    name = "gbcs", versionProvider = GradleBuildCacheServerCli.VersionProvider::class
+    name = "rbcs", versionProvider = RemoteBuildCacheServerCli.VersionProvider::class
 )
-class GradleBuildCacheServerCli : GbcsCommand() {
+class RemoteBuildCacheServerCli : RbcsCommand() {
 
     class VersionProvider : AbstractVersionProvider()
     companion object {
         @JvmStatic
         fun main(vararg args: String) {
-            val currentClassLoader = GradleBuildCacheServerCli::class.java.classLoader
+            val currentClassLoader = RemoteBuildCacheServerCli::class.java.classLoader
             Thread.currentThread().contextClassLoader = currentClassLoader
             if(currentClassLoader.javaClass.name == "net.woggioni.envelope.loader.ModuleClassLoader") {
                 //We're running in an envelope jar and custom URL protocols won't work
-                GbcsUrlStreamHandlerFactory.install()
+                RbcsUrlStreamHandlerFactory.install()
             }
             val log = contextLogger()
-            val app = Application.builder("gbcs")
-                .configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR")
-                .configurationDirectoryPropertyKey("net.woggioni.gbcs.conf.dir")
+            val app = Application.builder("rbcs")
+                .configurationDirectoryEnvVar("RBCS_CONFIGURATION_DIR")
+                .configurationDirectoryPropertyKey("net.woggioni.rbcs.conf.dir")
                 .build()
-            val gbcsCli = GradleBuildCacheServerCli()
-            val commandLine = CommandLine(gbcsCli)
+            val rbcsCli = RemoteBuildCacheServerCli()
+            val commandLine = CommandLine(rbcsCli)
             commandLine.setExecutionExceptionHandler { ex, cl, parseResult ->
                 log.error(ex.message, ex)
                 CommandLine.ExitCode.SOFTWARE

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/AbstractVersionProvider.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.cli.impl
+package net.woggioni.rbcs.cli.impl
 
 import picocli.CommandLine
 import java.util.jar.Attributes

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt

@@ -1,11 +1,11 @@
-package net.woggioni.gbcs.cli.impl
+package net.woggioni.rbcs.cli.impl
 
 import net.woggioni.jwo.Application
 import picocli.CommandLine
 import java.nio.file.Path
 
 
-abstract class GbcsCommand : Runnable {
+abstract class RbcsCommand : Runnable {
 
     @CommandLine.Option(names = ["-h", "--help"], usageHelp = true)
     var usageHelp = false

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/BenchmarkCommand.kt

@@ -1,10 +1,10 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GradleBuildCacheClient
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.common.error
-import net.woggioni.gbcs.common.info
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.client.RemoteBuildCacheClient
+import net.woggioni.rbcs.common.contextLogger
+import net.woggioni.rbcs.common.error
+import net.woggioni.rbcs.common.info
 import net.woggioni.jwo.JWO
 import picocli.CommandLine
 import java.security.SecureRandom
@@ -20,7 +20,7 @@ import kotlin.random.Random
     description = ["Run a load test against the server"],
     showDefaultValues = true
 )
-class BenchmarkCommand : GbcsCommand() {
+class BenchmarkCommand : RbcsCommand() {
     private val log = contextLogger()
 
     @CommandLine.Spec
@@ -46,7 +46,7 @@ class BenchmarkCommand : GbcsCommand() {
             clientCommand.configuration.profiles[profileName]
                 ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
         }
-        GradleBuildCacheClient(profile).use { client ->
+        RemoteBuildCacheClient(profile).use { client ->
 
             val entryGenerator = sequence {
                 val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt

@@ -1,24 +1,24 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GradleBuildCacheClient
+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
 
 @CommandLine.Command(
     name = "client",
-    description = ["GBCS client"],
+    description = ["RBCS client"],
     showDefaultValues = true
 )
-class ClientCommand(app : Application) : GbcsCommand() {
+class ClientCommand(app : Application) : RbcsCommand() {
 
     @CommandLine.Option(
         names = ["-c", "--configuration"],
         description = ["Path to the client configuration file"],
         paramLabel = "CONFIGURATION_FILE"
     )
-    private var configurationFile : Path = findConfigurationFile(app, "gbcs-client.xml")
+    private var configurationFile : Path = findConfigurationFile(app, "rbcs-client.xml")
 
     @CommandLine.Option(
         names = ["-p", "--profile"],
@@ -28,8 +28,8 @@ class ClientCommand(app : Application) : GbcsCommand() {
     )
     var profileName : String? = null
 
-    val configuration : GradleBuildCacheClient.Configuration by lazy {
-        GradleBuildCacheClient.Configuration.parse(configurationFile)
+    val configuration : RemoteBuildCacheClient.Configuration by lazy {
+        RemoteBuildCacheClient.Configuration.parse(configurationFile)
     }
 
     override fun run() {

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/GetCommand.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GradleBuildCacheClient
-import net.woggioni.gbcs.common.contextLogger
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.client.RemoteBuildCacheClient
+import net.woggioni.rbcs.common.contextLogger
 import picocli.CommandLine
 import java.nio.file.Files
 import java.nio.file.Path
@@ -12,7 +12,7 @@ import java.nio.file.Path
     description = ["Fetch a value from the cache with the specified key"],
     showDefaultValues = true
 )
-class GetCommand : GbcsCommand() {
+class GetCommand : RbcsCommand() {
     private val log = contextLogger()
 
     @CommandLine.Spec
@@ -38,7 +38,7 @@ class GetCommand : GbcsCommand() {
             clientCommand.configuration.profiles[profileName]
                 ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
         }
-        GradleBuildCacheClient(profile).use { client ->
+        RemoteBuildCacheClient(profile).use { client ->
             client.get(key).thenApply { value ->
                 value?.let {
                     (output?.let(Files::newOutputStream) ?: System.out).use {

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GradleBuildCacheClient
-import net.woggioni.gbcs.common.contextLogger
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.client.RemoteBuildCacheClient
+import net.woggioni.rbcs.common.contextLogger
 import picocli.CommandLine
 import java.security.SecureRandom
 import kotlin.random.Random
@@ -12,7 +12,7 @@ import kotlin.random.Random
     description = ["Check server health"],
     showDefaultValues = true
 )
-class HealthCheckCommand : GbcsCommand() {
+class HealthCheckCommand : RbcsCommand() {
     private val log = contextLogger()
 
     @CommandLine.Spec
@@ -24,7 +24,7 @@ class HealthCheckCommand : GbcsCommand() {
             clientCommand.configuration.profiles[profileName]
                 ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
         }
-        GradleBuildCacheClient(profile).use { client ->
+        RemoteBuildCacheClient(profile).use { client ->
             val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
             val nonce = ByteArray(0xa0)
             random.nextBytes(nonce)

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.cli.impl.converters.OutputStreamConverter
-import net.woggioni.gbcs.common.PasswordSecurity.hashPassword
+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
@@ -12,10 +12,10 @@ import java.io.PrintWriter
 
 @CommandLine.Command(
     name = "password",
-    description = ["Generate a password hash to add to GBCS configuration file"],
+    description = ["Generate a password hash to add to RBCS configuration file"],
     showDefaultValues = true
 )
-class PasswordHashCommand : GbcsCommand() {
+class PasswordHashCommand : RbcsCommand() {
     @CommandLine.Option(
         names = ["-o", "--output-file"],
         description = ["Write the output to a file instead of stdout"],

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt

@@ -1,9 +1,9 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.cli.impl.converters.InputStreamConverter
-import net.woggioni.gbcs.client.GradleBuildCacheClient
-import net.woggioni.gbcs.common.contextLogger
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.cli.impl.converters.InputStreamConverter
+import net.woggioni.rbcs.client.RemoteBuildCacheClient
+import net.woggioni.rbcs.common.contextLogger
 import picocli.CommandLine
 import java.io.InputStream
 
@@ -12,7 +12,7 @@ import java.io.InputStream
     description = ["Add or replace a value to the cache with the specified key"],
     showDefaultValues = true
 )
-class PutCommand : GbcsCommand() {
+class PutCommand : RbcsCommand() {
     private val log = contextLogger()
 
     @CommandLine.Spec
@@ -39,7 +39,7 @@ class PutCommand : GbcsCommand() {
             clientCommand.configuration.profiles[profileName]
                 ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
         }
-        GradleBuildCacheClient(profile).use { client ->
+        RemoteBuildCacheClient(profile).use { client ->
             value.use {
                 client.put(key, it.readAllBytes())
             }.get()

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ServerCommand.kt

@@ -1,13 +1,12 @@
-package net.woggioni.gbcs.cli.impl.commands
+package net.woggioni.rbcs.cli.impl.commands
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.cli.impl.converters.DurationConverter
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.common.debug
-import net.woggioni.gbcs.common.info
-import net.woggioni.gbcs.server.GradleBuildCacheServer
-import net.woggioni.gbcs.server.GradleBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
+import net.woggioni.rbcs.cli.impl.RbcsCommand
+import net.woggioni.rbcs.cli.impl.converters.DurationConverter
+import net.woggioni.rbcs.common.contextLogger
+import net.woggioni.rbcs.common.debug
+import net.woggioni.rbcs.common.info
+import net.woggioni.rbcs.server.RemoteBuildCacheServer
+import net.woggioni.rbcs.server.RemoteBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
 import net.woggioni.jwo.Application
 import net.woggioni.jwo.JWO
 import picocli.CommandLine
@@ -18,10 +17,10 @@ import java.time.Duration
 
 @CommandLine.Command(
     name = "server",
-    description = ["GBCS server"],
+    description = ["RBCS server"],
     showDefaultValues = true
 )
-class ServerCommand(app : Application) : GbcsCommand() {
+class ServerCommand(app : Application) : RbcsCommand() {
 
     private val log = contextLogger()
 
@@ -50,7 +49,7 @@ class ServerCommand(app : Application) : GbcsCommand() {
         description = ["Read the application configuration from this file"],
         paramLabel = "CONFIG_FILE"
     )
-    private var configurationFile: Path = findConfigurationFile(app, "gbcs-server.xml")
+    private var configurationFile: Path = findConfigurationFile(app, "rbcs-server.xml")
 
     override fun run() {
         if (!Files.exists(configurationFile)) {
@@ -58,15 +57,15 @@ class ServerCommand(app : Application) : GbcsCommand() {
             createDefaultConfigurationFile(configurationFile)
         }
 
-        val configuration = GradleBuildCacheServer.loadConfiguration(configurationFile)
+        val configuration = RemoteBuildCacheServer.loadConfiguration(configurationFile)
         log.debug {
             ByteArrayOutputStream().also {
-                GradleBuildCacheServer.dumpConfiguration(configuration, it)
+                RemoteBuildCacheServer.dumpConfiguration(configuration, it)
             }.let {
                 "Server configuration:\n${String(it.toByteArray())}"
             }
         }
-        val server = GradleBuildCacheServer(configuration)
+        val server = RemoteBuildCacheServer(configuration)
         server.run().use { server ->
             timeout?.let {
                 Thread.sleep(it)

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/DurationConverter.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.cli.impl.converters
+package net.woggioni.rbcs.cli.impl.converters
 
 import picocli.CommandLine
 import java.time.Duration

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/InputStreamConverter.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.cli.impl.converters
+package net.woggioni.rbcs.cli.impl.converters
 
 import picocli.CommandLine
 import java.io.InputStream

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/OutputStreamConverter.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.cli.impl.converters
+package net.woggioni.rbcs.cli.impl.converters
 
 import picocli.CommandLine
 import java.io.OutputStream

rbcs-client/build.gradle

@@ -4,11 +4,13 @@ plugins {
 }
 
 dependencies {
-    implementation project(':gbcs-api')
-    implementation project(':gbcs-common')
-    implementation catalog.picocli
+    implementation project(':rbcs-api')
+    implementation project(':rbcs-common')
     implementation catalog.slf4j.api
     implementation catalog.netty.buffer
+    implementation catalog.netty.handler
+    implementation catalog.netty.transport
+    implementation catalog.netty.common
     implementation catalog.netty.codec.http
 
     testRuntimeOnly catalog.logback.classic

rbcs-client/src/main/java/module-info.java

@@ -1,4 +1,4 @@
-module net.woggioni.gbcs.client {
+module net.woggioni.rbcs.client {
     requires io.netty.handler;
     requires io.netty.codec.http;
     requires io.netty.transport;
@@ -6,12 +6,12 @@ module net.woggioni.gbcs.client {
     requires io.netty.common;
     requires io.netty.buffer;
     requires java.xml;
-    requires net.woggioni.gbcs.common;
-    requires net.woggioni.gbcs.api;
+    requires net.woggioni.rbcs.common;
+    requires net.woggioni.rbcs.api;
     requires io.netty.codec;
     requires org.slf4j;
 
-    exports net.woggioni.gbcs.client;
+    exports net.woggioni.rbcs.client;
 
-    opens net.woggioni.gbcs.client.schema;
+    opens net.woggioni.rbcs.client.schema;
 }

rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.client
+package net.woggioni.rbcs.client
 
 import io.netty.bootstrap.Bootstrap
 import io.netty.buffer.ByteBuf
@@ -30,11 +30,11 @@ import io.netty.handler.ssl.SslContextBuilder
 import io.netty.handler.stream.ChunkedWriteHandler
 import io.netty.util.concurrent.Future
 import io.netty.util.concurrent.GenericFutureListener
-import net.woggioni.gbcs.client.impl.Parser
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.common.debug
-import net.woggioni.gbcs.common.trace
+import net.woggioni.rbcs.client.impl.Parser
+import net.woggioni.rbcs.common.Xml
+import net.woggioni.rbcs.common.contextLogger
+import net.woggioni.rbcs.common.debug
+import net.woggioni.rbcs.common.trace
 import java.net.InetSocketAddress
 import java.net.URI
 import java.nio.file.Files
@@ -45,10 +45,10 @@ import java.time.Duration
 import java.util.Base64
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.random.Random
 import io.netty.util.concurrent.Future as NettyFuture
 
-
-class GradleBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable {
+class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable {
     private val group: NioEventLoopGroup
     private var sslContext: SslContext
     private val log = contextLogger()
@@ -206,6 +206,7 @@ class GradleBuildCacheClient(private val profile: Configuration.Profile) : AutoC
                 retryPolicy.initialDelayMillis.toDouble(),
                 retryPolicy.exp,
                 outcomeHandler,
+                Random.Default,
                 operation
             )
         } else {

rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Exception.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.client
+package net.woggioni.rbcs.client
 
 import io.netty.handler.codec.http.HttpResponseStatus
 

rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt

@@ -1,9 +1,9 @@
-package net.woggioni.gbcs.client.impl
+package net.woggioni.rbcs.client.impl
 
-import net.woggioni.gbcs.api.exception.ConfigurationException
-import net.woggioni.gbcs.client.GradleBuildCacheClient
-import net.woggioni.gbcs.common.Xml.Companion.asIterable
-import net.woggioni.gbcs.common.Xml.Companion.renderAttribute
+import net.woggioni.rbcs.api.exception.ConfigurationException
+import net.woggioni.rbcs.client.RemoteBuildCacheClient
+import net.woggioni.rbcs.common.Xml.Companion.asIterable
+import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
 import org.w3c.dom.Document
 import java.net.URI
 import java.nio.file.Files
@@ -15,9 +15,9 @@ import java.time.Duration
 
 object Parser {
 
-    fun parse(document: Document): GradleBuildCacheClient.Configuration {
+    fun parse(document: Document): RemoteBuildCacheClient.Configuration {
         val root = document.documentElement
-        val profiles = mutableMapOf<String, GradleBuildCacheClient.Configuration.Profile>()
+        val profiles = mutableMapOf<String, RemoteBuildCacheClient.Configuration.Profile>()
 
         for (child in root.asIterable()) {
             val tagName = child.localName
@@ -27,8 +27,8 @@ object Parser {
                         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: GradleBuildCacheClient.Configuration.Authentication? = null
-                    var retryPolicy: GradleBuildCacheClient.Configuration.RetryPolicy? = null
+                    var authentication: RemoteBuildCacheClient.Configuration.Authentication? = null
+                    var retryPolicy: RemoteBuildCacheClient.Configuration.RetryPolicy? = null
                     for (gchild in child.asIterable()) {
                         when (gchild.localName) {
                             "tls-client-auth" -> {
@@ -49,7 +49,7 @@ object Parser {
                                     .toList()
                                     .toTypedArray()
                                 authentication =
-                                    GradleBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials(
+                                    RemoteBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials(
                                         key,
                                         certChain
                                     )
@@ -61,7 +61,7 @@ object Parser {
                                 val password = gchild.renderAttribute("password")
                                     ?: throw ConfigurationException("password attribute is required")
                                 authentication =
-                                    GradleBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials(
+                                    RemoteBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials(
                                         username,
                                         password
                                     )
@@ -80,7 +80,7 @@ object Parser {
                                     gchild.renderAttribute("exp")
                                         ?.let(String::toDouble)
                                         ?: 2.0f
-                                retryPolicy = GradleBuildCacheClient.Configuration.RetryPolicy(
+                                retryPolicy = RemoteBuildCacheClient.Configuration.RetryPolicy(
                                     maxAttempts,
                                     initialDelay.toMillis(),
                                     exp.toDouble()
@@ -93,7 +93,7 @@ object Parser {
                         ?: 50
                     val connectionTimeout = child.renderAttribute("connection-timeout")
                         ?.let(Duration::parse)
-                    profiles[name] = GradleBuildCacheClient.Configuration.Profile(
+                    profiles[name] = RemoteBuildCacheClient.Configuration.Profile(
                         uri,
                         authentication,
                         connectionTimeout,
@@ -103,6 +103,6 @@ object Parser {
                 }
             }
         }
-        return GradleBuildCacheClient.Configuration(profiles)
+        return RemoteBuildCacheClient.Configuration(profiles)
     }
 }

rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt

@@ -1,8 +1,10 @@
-package net.woggioni.gbcs.client
+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
 
 sealed class OperationOutcome<T> {
     class Success<T>(val result: T) : OperationOutcome<T>()
@@ -24,8 +26,10 @@ fun <T> executeWithRetry(
     initialDelay: Double,
     exp: Double,
     outcomeHandler: OutcomeHandler<T>,
+    randomizer : Random?,
     cb: () -> CompletableFuture<T>
 ): CompletableFuture<T> {
+
     val finalResult = cb()
     var future = finalResult
     var shortCircuit = false
@@ -46,7 +50,7 @@ fun <T> executeWithRetry(
                     is OutcomeHandlerResult.Retry -> {
                         val res = CompletableFuture<T>()
                         val delay = run {
-                            val scheduledDelay = (initialDelay * Math.pow(exp, i.toDouble())).toLong()
+                            val scheduledDelay = (initialDelay * exp.pow(i.toDouble()) * (1.0 + (randomizer?.nextDouble(-0.5, 0.5) ?: 0.0))).toLong()
                             outcomeHandlerResult.suggestedDelayMillis?.coerceAtMost(scheduledDelay) ?: scheduledDelay
                         }
                         eventExecutorGroup.schedule({

rbcs-client/src/main/resources/net/woggioni/rbcs/client/schema/rbcs-client.xsd

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema targetNamespace="urn:net.woggioni.gbcs.client"
+<xs:schema targetNamespace="urn:net.woggioni.rbcs.client"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:gbcs-client="urn:net.woggioni.gbcs.client"
+           xmlns:rbcs-client="urn:net.woggioni.rbcs.client"
            elementFormDefault="unqualified"
 >
-    <xs:element name="profiles" type="gbcs-client:profilesType"/>
+    <xs:element name="profiles" type="rbcs-client:profilesType"/>
 
     <xs:complexType name="profilesType">
         <xs:sequence minOccurs="0">
-            <xs:element name="profile" type="gbcs-client:profileType" maxOccurs="unbounded"/>
+            <xs:element name="profile" type="rbcs-client:profileType" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="profileType">
         <xs:sequence>
             <xs:choice>
-                <xs:element name="no-auth" type="gbcs-client:noAuthType"/>
-                <xs:element name="basic-auth" type="gbcs-client:basicAuthType"/>
-                <xs:element name="tls-client-auth" type="gbcs-client:tlsClientAuthType"/>
+                <xs:element name="no-auth" type="rbcs-client:noAuthType"/>
+                <xs:element name="basic-auth" type="rbcs-client:basicAuthType"/>
+                <xs:element name="tls-client-auth" type="rbcs-client:tlsClientAuthType"/>
             </xs:choice>
-            <xs:element name="retry-policy" type="gbcs-client:retryType" minOccurs="0"/>
+            <xs:element name="retry-policy" type="rbcs-client:retryType" minOccurs="0"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:token" use="required"/>
         <xs:attribute name="base-url" type="xs:anyURI" use="required"/>

rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.client
+package net.woggioni.rbcs.client
 
 import io.netty.util.concurrent.DefaultEventExecutorGroup
 import io.netty.util.concurrent.EventExecutorGroup
-import net.woggioni.gbcs.common.contextLogger
+import net.woggioni.rbcs.common.contextLogger
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.params.ParameterizedTest
@@ -89,7 +89,7 @@ class RetryTest {
         val random = Random(testArgs.seed)
 
         val future =
-            executeWithRetry(executor, testArgs.maxAttempt, testArgs.initialDelay, testArgs.exp, outcomeHandler) {
+            executeWithRetry(executor, testArgs.maxAttempt, testArgs.initialDelay, testArgs.exp, outcomeHandler, null) {
                 val now = System.nanoTime()
                 val result = CompletableFuture<Int>()
                 executor.submit {
@@ -129,7 +129,7 @@ class RetryTest {
                     previousAttempt.first + testArgs.initialDelay * Math.pow(testArgs.exp, index.toDouble()) * 1e6
                 val actualTimestamp = timestamp
                 val err = Math.abs(expectedTimestamp - actualTimestamp) / expectedTimestamp
-                Assertions.assertTrue(err < 1e-3)
+                Assertions.assertTrue(err < 1e-2)
             }
             if (index == attempts.size - 1 && index < testArgs.maxAttempt - 1) {
                 /*

rbcs-client/src/test/resources/net/woggioni/rbcs/client/test/rbcs-client.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<rbcs-client:profiles xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+                      xmlns:rbcs-client="urn:net.woggioni.rbcs.client"
+                      xs:schemaLocation="urn:net.woggioni.rbcs.client jms://net.woggioni.rbcs.client/net/woggioni/rbcs/client/schema/rbcs-client.xsd"
+                      >
+    <profile name="profile1" base-url="https://rbcs1.example.com/">
+        <tls-client-auth
+                key-store-file="keystore.pfx"
+                key-store-password="password"
+                key-alias="woggioni@c962475fa38"
+                key-password="key-password"/>
+    </profile>
+    <profile name="profile2" base-url="https://rbcs2.example.com/">
+        <basic-auth user="user" password="password"/>
+    </profile>
+</rbcs-client:profiles>

rbcs-common/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    implementation project(':gbcs-api')
+    implementation project(':rbcs-api')
     implementation catalog.slf4j.api
     implementation catalog.jwo
     implementation catalog.netty.buffer

rbcs-common/src/main/java/module-info.java

@@ -1,4 +1,4 @@
-module net.woggioni.gbcs.common {
+module net.woggioni.rbcs.common {
     requires java.xml;
     requires java.logging;
     requires org.slf4j;
@@ -6,6 +6,6 @@ module net.woggioni.gbcs.common {
     requires net.woggioni.jwo;
     requires io.netty.buffer;
 
-    provides java.net.spi.URLStreamHandlerProvider with net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory;
-    exports net.woggioni.gbcs.common;
+    provides java.net.spi.URLStreamHandlerProvider with net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory;
+    exports net.woggioni.rbcs.common;
 }

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import io.netty.buffer.ByteBuf
 import java.io.InputStream

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt

@@ -1,7 +1,6 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import io.netty.buffer.ByteBuf
-import java.io.InputStream
 import java.io.OutputStream
 
 class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() {

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Exception.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 class ResourceNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) {
 }

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/HostAndPort.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 
 data class HostAndPort(val host: String, val port: Int = 0) {

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/PasswordSecurity.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import java.security.SecureRandom
 import java.security.spec.KeySpec

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt

@@ -0,0 +1,47 @@
+package net.woggioni.rbcs.common
+
+import net.woggioni.jwo.JWO
+import java.net.URI
+import java.net.URL
+import java.security.MessageDigest
+
+object RBCS {
+    fun String.toUrl() : URL = URL.of(URI(this), null)
+
+    const val RBCS_NAMESPACE_URI: String = "urn:net.woggioni.rbcs.server"
+    const val RBCS_PREFIX: String = "rbcs"
+    const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"
+
+    fun ByteArray.toInt(index : Int = 0) : Long {
+        if(index + 4 > size) throw IllegalArgumentException("Not enough bytes to decode a 32 bits integer")
+        var value : Long = 0
+        for (b in index until index + 4) {
+            value = (value shl 8) + (get(b).toInt() and 0xFF)
+        }
+        return value
+    }
+
+    fun ByteArray.toLong(index : Int = 0) : Long {
+        if(index + 8 > size) throw IllegalArgumentException("Not enough bytes to decode a 64 bits long integer")
+        var value : Long = 0
+        for (b in index until index + 8) {
+            value = (value shl 8) + (get(b).toInt() and 0xFF)
+        }
+        return value
+    }
+
+    fun digest(
+        data: ByteArray,
+        md: MessageDigest = MessageDigest.getInstance("MD5")
+    ): ByteArray {
+        md.update(data)
+        return md.digest()
+    }
+
+    fun digestString(
+        data: ByteArray,
+        md: MessageDigest = MessageDigest.getInstance("MD5")
+    ): String {
+        return JWO.bytesToHex(digest(data, md))
+    }
+}

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RbcsUrlStreamHandlerFactory.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import java.io.IOException
 import java.io.InputStream
@@ -6,14 +6,13 @@ import java.net.URL
 import java.net.URLConnection
 import java.net.URLStreamHandler
 import java.net.spi.URLStreamHandlerProvider
-import java.util.Optional
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.stream.Collectors
 
 
-class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
+class RbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
 
-    private class ClasspathHandler(private val classLoader: ClassLoader = GbcsUrlStreamHandlerFactory::class.java.classLoader) :
+    private class ClasspathHandler(private val classLoader: ClassLoader = RbcsUrlStreamHandlerFactory::class.java.classLoader) :
         URLStreamHandler() {
 
         override fun openConnection(u: URL): URLConnection? {
@@ -88,12 +87,12 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
         private val installed = AtomicBoolean(false)
         fun install() {
             if (!installed.getAndSet(true)) {
-                URL.setURLStreamHandlerFactory(GbcsUrlStreamHandlerFactory())
+                URL.setURLStreamHandlerFactory(RbcsUrlStreamHandlerFactory())
             }
         }
 
         private val packageMap: Map<String, List<Module>> by lazy {
-            GbcsUrlStreamHandlerFactory::class.java.module.layer
+            RbcsUrlStreamHandlerFactory::class.java.module.layer
                 .modules()
                 .stream()
                 .flatMap { m: Module ->

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.common
+package net.woggioni.rbcs.common
 
 import net.woggioni.jwo.JWO
 import org.slf4j.LoggerFactory

rbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider

@@ -0,0 +1 @@
+net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory

rbcs-server-memcache/build.gradle

@@ -29,8 +29,8 @@ configurations {
 }
 
 dependencies {
-    implementation project(':gbcs-common')
-    implementation project(':gbcs-api')
+    implementation project(':rbcs-common')
+    implementation project(':rbcs-api')
     implementation catalog.jwo
     implementation catalog.slf4j.api
     implementation catalog.netty.common

rbcs-server-memcache/src/main/java/module-info.java

@@ -1,8 +1,8 @@
-import net.woggioni.gbcs.api.CacheProvider;
+import net.woggioni.rbcs.api.CacheProvider;
 
-module net.woggioni.gbcs.server.memcache {
-    requires net.woggioni.gbcs.common;
-    requires net.woggioni.gbcs.api;
+module net.woggioni.rbcs.server.memcache {
+    requires net.woggioni.rbcs.common;
+    requires net.woggioni.rbcs.api;
     requires net.woggioni.jwo;
     requires java.xml;
     requires kotlin.stdlib;
@@ -13,7 +13,7 @@ module net.woggioni.gbcs.server.memcache {
     requires io.netty.buffer;
     requires org.slf4j;
 
-    provides CacheProvider with net.woggioni.gbcs.server.memcache.MemcacheCacheProvider;
+    provides CacheProvider with net.woggioni.rbcs.server.memcache.MemcacheCacheProvider;
 
-    opens net.woggioni.gbcs.server.memcache.schema;
+    opens net.woggioni.rbcs.server.memcache.schema;
 }

rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/Exception.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.memcache
+package net.woggioni.rbcs.server.memcache
 
 class MemcacheException(status : Short, msg : String? = null, cause : Throwable? = null)
     : RuntimeException(msg ?: "Memcached status $status", cause)

rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCache.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.server.memcache
+package net.woggioni.rbcs.server.memcache
 
 import io.netty.buffer.ByteBuf
-import net.woggioni.gbcs.api.Cache
-import net.woggioni.gbcs.server.memcache.client.MemcacheClient
+import net.woggioni.rbcs.api.Cache
+import net.woggioni.rbcs.server.memcache.client.MemcacheClient
 import java.nio.channels.ReadableByteChannel
 import java.util.concurrent.CompletableFuture
 

rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.server.memcache
+package net.woggioni.rbcs.server.memcache
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.common.HostAndPort
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.common.HostAndPort
 import java.time.Duration
 
 data class MemcacheCacheConfiguration(
@@ -33,7 +33,7 @@ data class MemcacheCacheConfiguration(
 
     override fun materialize() = MemcacheCache(this)
 
-    override fun getNamespaceURI() = "urn:net.woggioni.gbcs.server.memcache"
+    override fun getNamespaceURI() = "urn:net.woggioni.rbcs.server.memcache"
 
     override fun getTypeName() = "memcacheCacheType"
 }

rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt

@@ -1,12 +1,12 @@
-package net.woggioni.gbcs.server.memcache
+package net.woggioni.rbcs.server.memcache
 
-import net.woggioni.gbcs.api.CacheProvider
-import net.woggioni.gbcs.api.exception.ConfigurationException
-import net.woggioni.gbcs.common.GBCS
-import net.woggioni.gbcs.common.HostAndPort
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.common.Xml.Companion.asIterable
-import net.woggioni.gbcs.common.Xml.Companion.renderAttribute
+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.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
 import java.time.Duration
@@ -14,14 +14,14 @@ import java.time.temporal.ChronoUnit
 
 
 class MemcacheCacheProvider : CacheProvider<MemcacheCacheConfiguration> {
-    override fun getXmlSchemaLocation() = "jpms://net.woggioni.gbcs.server.memcache/net/woggioni/gbcs/server/memcache/schema/gbcs-memcache.xsd"
+    override fun getXmlSchemaLocation() = "jpms://net.woggioni.rbcs.server.memcache/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd"
 
     override fun getXmlType() = "memcacheCacheType"
 
-    override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server.memcache"
+    override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server.memcache"
 
     val xmlNamespacePrefix : String
-        get() = "gbcs-memcache"
+        get() = "rbcs-memcache"
 
     override fun deserialize(el: Element): MemcacheCacheConfiguration {
         val servers = mutableListOf<MemcacheCacheConfiguration.Server>()
@@ -71,7 +71,7 @@ class MemcacheCacheProvider : CacheProvider<MemcacheCacheConfiguration> {
         Xml.of(doc, result) {
             attr("xmlns:${xmlNamespacePrefix}", xmlNamespace, namespaceURI = "http://www.w3.org/2000/xmlns/")
 
-            attr("xs:type", "${xmlNamespacePrefix}:$xmlType", GBCS.XML_SCHEMA_NAMESPACE_URI)
+            attr("xs:type", "${xmlNamespacePrefix}:$xmlType", RBCS.XML_SCHEMA_NAMESPACE_URI)
             for (server in servers) {
                 node("server") {
                     attr("host", server.endpoint.host)

rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.memcache.client
+package net.woggioni.rbcs.server.memcache.client
 
 
 import io.netty.bootstrap.Bootstrap
@@ -23,15 +23,14 @@ import io.netty.handler.codec.memcache.binary.DefaultFullBinaryMemcacheRequest
 import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheRequest
 import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheResponse
 import io.netty.util.concurrent.GenericFutureListener
-import net.woggioni.gbcs.common.ByteBufInputStream
-import net.woggioni.gbcs.common.ByteBufOutputStream
-import net.woggioni.gbcs.common.GBCS.digest
-import net.woggioni.gbcs.common.HostAndPort
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.server.memcache.MemcacheCacheConfiguration
-import net.woggioni.gbcs.server.memcache.MemcacheException
+import net.woggioni.rbcs.common.ByteBufInputStream
+import net.woggioni.rbcs.common.ByteBufOutputStream
+import net.woggioni.rbcs.common.RBCS.digest
+import net.woggioni.rbcs.common.HostAndPort
+import net.woggioni.rbcs.common.contextLogger
+import net.woggioni.rbcs.server.memcache.MemcacheCacheConfiguration
+import net.woggioni.rbcs.server.memcache.MemcacheException
 import net.woggioni.jwo.JWO
-import java.io.ByteArrayOutputStream
 import java.net.InetSocketAddress
 import java.nio.channels.Channels
 import java.nio.channels.ReadableByteChannel
@@ -77,7 +76,7 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
             override fun channelCreated(ch: Channel) {
                 val pipeline: ChannelPipeline = ch.pipeline()
                 pipeline.addLast(BinaryMemcacheClientCodec())
-                pipeline.addLast(BinaryMemcacheObjectAggregator(Integer.MAX_VALUE))
+                pipeline.addLast(BinaryMemcacheObjectAggregator(cfg.maxSize))
             }
         }
         return FixedChannelPool(bootstrap, channelPoolHandler, server.maxConnections)

rbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider

@@ -0,0 +1 @@
+net.woggioni.rbcs.server.memcache.MemcacheCacheProvider

rbcs-server-memcache/src/main/resources/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema targetNamespace="urn:net.woggioni.gbcs.server.memcache"
-           xmlns:gbcs-memcache="urn:net.woggioni.gbcs.server.memcache"
-           xmlns:gbcs="urn:net.woggioni.gbcs.server"
+<xs:schema targetNamespace="urn:net.woggioni.rbcs.server.memcache"
+           xmlns:rbcs-memcache="urn:net.woggioni.rbcs.server.memcache"
+           xmlns:rbcs="urn:net.woggioni.rbcs.server"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-    <xs:import schemaLocation="jpms://net.woggioni.gbcs.server/net/woggioni/gbcs/server/schema/gbcs.xsd" namespace="urn:net.woggioni.gbcs.server"/>
+    <xs:import schemaLocation="jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs.xsd" namespace="urn:net.woggioni.rbcs.server"/>
 
     <xs:complexType name="memcacheServerType">
         <xs:attribute name="host" type="xs:token" use="required"/>
@@ -15,14 +15,14 @@
 
     <xs:complexType name="memcacheCacheType">
         <xs:complexContent>
-            <xs:extension base="gbcs:cacheType">
+            <xs:extension base="rbcs:cacheType">
                 <xs:sequence maxOccurs="unbounded">
-                    <xs:element name="server" type="gbcs-memcache:memcacheServerType"/>
+                    <xs:element name="server" type="rbcs-memcache:memcacheServerType"/>
                 </xs:sequence>
                 <xs:attribute name="max-age" type="xs:duration" default="P1D"/>
                 <xs:attribute name="max-size" type="xs:unsignedInt" default="1048576"/>
                 <xs:attribute name="digest" type="xs:token" />
-                <xs:attribute name="compression-mode" type="gbcs-memcache:compressionType"/>
+                <xs:attribute name="compression-mode" type="rbcs-memcache:compressionType"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>

rbcs-server/build.gradle

@@ -9,9 +9,12 @@ dependencies {
     implementation catalog.jwo
     implementation catalog.slf4j.api
     implementation catalog.netty.codec.http
+    implementation catalog.netty.handler
+    implementation catalog.netty.buffer
+    implementation catalog.netty.transport
 
-    api project(':gbcs-common')
-    api project(':gbcs-api')
+    api project(':rbcs-common')
+    api project(':rbcs-api')
 
 //    runtimeOnly catalog.slf4j.jdk14
     testRuntimeOnly catalog.logback.classic
@@ -19,7 +22,7 @@ dependencies {
     testImplementation catalog.bcprov.jdk18on
     testImplementation catalog.bcpkix.jdk18on
 
-    testRuntimeOnly project(":gbcs-server-memcache")
+    testRuntimeOnly project(":rbcs-server-memcache")
 }
 
 test {
@@ -36,3 +39,4 @@ publishing {
 }
 
 
+

rbcs-server/src/main/java/module-info.java

@@ -1,8 +1,8 @@
-import net.woggioni.gbcs.api.CacheProvider;
-import net.woggioni.gbcs.server.cache.FileSystemCacheProvider;
-import net.woggioni.gbcs.server.cache.InMemoryCacheProvider;
+import net.woggioni.rbcs.api.CacheProvider;
+import net.woggioni.rbcs.server.cache.FileSystemCacheProvider;
+import net.woggioni.rbcs.server.cache.InMemoryCacheProvider;
 
-module net.woggioni.gbcs.server {
+module net.woggioni.rbcs.server {
     requires java.sql;
     requires java.xml;
     requires java.logging;
@@ -16,13 +16,13 @@ module net.woggioni.gbcs.server {
     requires io.netty.codec;
     requires org.slf4j;
     requires net.woggioni.jwo;
-    requires net.woggioni.gbcs.common;
-    requires net.woggioni.gbcs.api;
+    requires net.woggioni.rbcs.common;
+    requires net.woggioni.rbcs.api;
 
-    exports net.woggioni.gbcs.server;
+    exports net.woggioni.rbcs.server;
 
-    opens net.woggioni.gbcs.server;
-    opens net.woggioni.gbcs.server.schema;
+    opens net.woggioni.rbcs.server;
+    opens net.woggioni.rbcs.server.schema;
 
     uses CacheProvider;
     provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/Logging.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server
+package net.woggioni.rbcs.server
 
 import io.netty.channel.ChannelHandlerContext
 import org.slf4j.Logger

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server
+package net.woggioni.rbcs.server
 
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.buffer.ByteBuf
@@ -30,26 +30,26 @@ import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.AttributeKey
 import io.netty.util.concurrent.DefaultEventExecutorGroup
 import io.netty.util.concurrent.EventExecutorGroup
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.exception.ConfigurationException
-import net.woggioni.gbcs.common.GBCS.toUrl
-import net.woggioni.gbcs.common.PasswordSecurity.decodePasswordHash
-import net.woggioni.gbcs.common.PasswordSecurity.hashPassword
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.common.debug
-import net.woggioni.gbcs.common.info
-import net.woggioni.gbcs.server.auth.AbstractNettyHttpAuthenticator
-import net.woggioni.gbcs.server.auth.Authorizer
-import net.woggioni.gbcs.server.auth.ClientCertificateValidator
-import net.woggioni.gbcs.server.auth.RoleAuthorizer
-import net.woggioni.gbcs.server.configuration.Parser
-import net.woggioni.gbcs.server.configuration.Serializer
-import net.woggioni.gbcs.server.exception.ExceptionHandler
-import net.woggioni.gbcs.server.handler.ServerHandler
-import net.woggioni.gbcs.server.throttling.ThrottlingHandler
 import net.woggioni.jwo.JWO
 import net.woggioni.jwo.Tuple2
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.api.exception.ConfigurationException
+import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash
+import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
+import net.woggioni.rbcs.common.RBCS.toUrl
+import net.woggioni.rbcs.common.Xml
+import net.woggioni.rbcs.common.contextLogger
+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.ClientCertificateValidator
+import net.woggioni.rbcs.server.auth.RoleAuthorizer
+import net.woggioni.rbcs.server.configuration.Parser
+import net.woggioni.rbcs.server.configuration.Serializer
+import net.woggioni.rbcs.server.exception.ExceptionHandler
+import net.woggioni.rbcs.server.handler.ServerHandler
+import net.woggioni.rbcs.server.throttling.ThrottlingHandler
 import java.io.OutputStream
 import java.net.InetSocketAddress
 import java.nio.file.Files
@@ -59,13 +59,14 @@ import java.security.PrivateKey
 import java.security.cert.X509Certificate
 import java.util.Arrays
 import java.util.Base64
+import java.util.concurrent.Future
 import java.util.concurrent.TimeUnit
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 import javax.naming.ldap.LdapName
 import javax.net.ssl.SSLPeerUnverifiedException
 
-class GradleBuildCacheServer(private val cfg: Configuration) {
+class RemoteBuildCacheServer(private val cfg: Configuration) {
     private val log = contextLogger()
 
     companion object {
@@ -73,7 +74,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
         val userAttribute: AttributeKey<Configuration.User> = AttributeKey.valueOf("user")
         val groupAttribute: AttributeKey<Set<Configuration.Group>> = AttributeKey.valueOf("group")
 
-        val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/gbcs/gbcs-default.xml".toUrl() }
+        val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/rbcs/server/rbcs-default.xml".toUrl() }
         private const val SSL_HANDLER_NAME = "sslHandler"
 
         fun loadConfiguration(configurationFile: Path): Configuration {
@@ -128,11 +129,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                     val clientCertificate = peerCertificates.first() as X509Certificate
                     val user = userExtractor?.extract(clientCertificate)
                     val group = groupExtractor?.extract(clientCertificate)
-                    val allGroups = ((user?.groups ?: emptySet()).asSequence() + sequenceOf(group).filterNotNull()).toSet()
+                    val allGroups =
+                        ((user?.groups ?: emptySet()).asSequence() + sequenceOf(group).filterNotNull()).toSet()
                     AuthenticationResult(user, allGroups)
-                } ?: anonymousUserGroups?.let{ AuthenticationResult(null, it) }
+                } ?: anonymousUserGroups?.let { AuthenticationResult(null, it) }
             } catch (es: SSLPeerUnverifiedException) {
-                anonymousUserGroups?.let{ AuthenticationResult(null, it) }
+                anonymousUserGroups?.let { AuthenticationResult(null, it) }
             }
         }
     }
@@ -191,7 +193,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
     private class ServerInitializer(
         private val cfg: Configuration,
         private val eventExecutorGroup: EventExecutorGroup
-    ) : ChannelInitializer<Channel>() {
+    ) : ChannelInitializer<Channel>(), AutoCloseable {
 
         companion object {
             private fun createSslCtx(tls: Configuration.Tls): SslContext {
@@ -213,7 +215,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                             trustManager(
                                 ClientCertificateValidator.getTrustManager(ts, trustStore.isCheckCertificateStatus)
                             )
-                            if(trustStore.isRequireClientCertificate) ClientAuth.REQUIRE
+                            if (trustStore.isRequireClientCertificate) ClientAuth.REQUIRE
                             else ClientAuth.OPTIONAL
                         } ?: ClientAuth.NONE
                         clientAuth(clientAuth)
@@ -245,10 +247,11 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
 
         private val log = contextLogger()
 
+        private val cache  = cfg.cache.materialize()
+
         private val serverHandler = let {
-            val cacheImplementation = cfg.cache.materialize()
             val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
-            ServerHandler(cacheImplementation, prefix)
+            ServerHandler(cache, prefix)
         }
 
         private val exceptionHandler = ExceptionHandler()
@@ -311,7 +314,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             cfg.connection.also { conn ->
                 val readTimeout = conn.readTimeout.toMillis()
                 val writeTimeout = conn.writeTimeout.toMillis()
-                if(readTimeout > 0 || writeTimeout > 0) {
+                if (readTimeout > 0 || writeTimeout > 0) {
                     pipeline.addLast(
                         IdleStateHandler(
                             false,
@@ -325,7 +328,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                 val readIdleTimeout = conn.readIdleTimeout.toMillis()
                 val writeIdleTimeout = conn.writeIdleTimeout.toMillis()
                 val idleTimeout = conn.idleTimeout.toMillis()
-                if(readIdleTimeout > 0 || writeIdleTimeout > 0 || idleTimeout > 0) {
+                if (readIdleTimeout > 0 || writeIdleTimeout > 0 || idleTimeout > 0) {
                     pipeline.addLast(
                         IdleStateHandler(
                             true,
@@ -340,16 +343,19 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             pipeline.addLast(object : ChannelInboundHandlerAdapter() {
                 override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) {
                     if (evt is IdleStateEvent) {
-                        when(evt.state()) {
+                        when (evt.state()) {
                             IdleState.READER_IDLE -> log.debug {
                                 "Read timeout reached on channel ${ch.id().asShortText()}, closing the connection"
                             }
+
                             IdleState.WRITER_IDLE -> log.debug {
                                 "Write timeout reached on channel ${ch.id().asShortText()}, closing the connection"
                             }
+
                             IdleState.ALL_IDLE -> log.debug {
                                 "Idle timeout reached on channel ${ch.id().asShortText()}, closing the connection"
                             }
+
                             null -> throw IllegalStateException("This should never happen")
                         }
                         ctx.close()
@@ -370,30 +376,45 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             pipeline.addLast(eventExecutorGroup, serverHandler)
             pipeline.addLast(exceptionHandler)
         }
+
+        override fun close() {
+            cache.close()
+        }
     }
 
     class ServerHandle(
         httpChannelFuture: ChannelFuture,
-        private val executorGroups: Iterable<EventExecutorGroup>
+        private val executorGroups: Iterable<EventExecutorGroup>,
+        private val serverInitializer: AutoCloseable
     ) : AutoCloseable {
         private val httpChannel: Channel = httpChannelFuture.channel()
         private val closeFuture: ChannelFuture = httpChannel.closeFuture()
         private val log = contextLogger()
 
-        fun shutdown(): ChannelFuture {
+        fun shutdown(): Future<Void> {
             return httpChannel.close()
         }
 
         override fun close() {
             try {
                 closeFuture.sync()
-            } finally {
-                executorGroups.forEach {
+            } catch (ex: Throwable) {
+                log.error(ex.message, ex)
+            }
+            try {
+                serverInitializer.close()
+            } catch (ex: Throwable) {
+                log.error(ex.message, ex)
+            }
+            executorGroups.forEach {
+                try {
                     it.shutdownGracefully().sync()
+                } catch (ex: Throwable) {
+                    log.error(ex.message, ex)
                 }
             }
             log.info {
-                "GradleBuildCacheServer has been gracefully shut down"
+                "RemoteBuildCacheServer has been gracefully shut down"
             }
         }
     }
@@ -411,11 +432,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             }
             DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors(), threadFactory)
         }
+        val serverInitializer = ServerInitializer(cfg, eventExecutorGroup)
         val bootstrap = ServerBootstrap().apply {
             // Configure the server
             group(bossGroup, workerGroup)
             channel(serverSocketChannel)
-            childHandler(ServerInitializer(cfg, eventExecutorGroup))
+            childHandler(serverInitializer)
             option(ChannelOption.SO_BACKLOG, cfg.incomingConnectionsBacklogSize)
             childOption(ChannelOption.SO_KEEPALIVE, true)
         }
@@ -425,8 +447,8 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
         val bindAddress = InetSocketAddress(cfg.host, cfg.port)
         val httpChannel = bootstrap.bind(bindAddress).sync()
         log.info {
-            "GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
+            "RemoteBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
         }
-        return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup))
+        return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup), serverInitializer)
     }
 }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.auth
+package net.woggioni.rbcs.server.auth
 
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelFutureListener
@@ -11,10 +11,10 @@ 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 net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.Configuration.Group
-import net.woggioni.gbcs.api.Role
-import net.woggioni.gbcs.server.GradleBuildCacheServer
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.api.Configuration.Group
+import net.woggioni.rbcs.api.Role
+import net.woggioni.rbcs.server.RemoteBuildCacheServer
 
 
 abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer) : ChannelInboundHandlerAdapter() {
@@ -40,8 +40,8 @@ abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer
     override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
         if (msg is HttpRequest) {
             val result = authenticate(ctx, msg) ?: return authenticationFailure(ctx, msg)
-            ctx.channel().attr(GradleBuildCacheServer.userAttribute).set(result.user)
-            ctx.channel().attr(GradleBuildCacheServer.groupAttribute).set(result.groups)
+            ctx.channel().attr(RemoteBuildCacheServer.userAttribute).set(result.user)
+            ctx.channel().attr(RemoteBuildCacheServer.groupAttribute).set(result.groups)
 
             val roles = (
                 (result.user?.let { user ->

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authorizer.kt

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.server.auth
+package net.woggioni.rbcs.server.auth
 
 import io.netty.handler.codec.http.HttpRequest
-import net.woggioni.gbcs.api.Role
+import net.woggioni.rbcs.api.Role
 
 fun interface Authorizer {
     fun authorize(roles : Set<Role>, request: HttpRequest) : Boolean

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/ClientCertificateValidator.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.auth
+package net.woggioni.rbcs.server.auth
 
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInboundHandlerAdapter

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/UserAuthorizer.kt

@@ -1,8 +1,8 @@
-package net.woggioni.gbcs.server.auth
+package net.woggioni.rbcs.server.auth
 
 import io.netty.handler.codec.http.HttpMethod
 import io.netty.handler.codec.http.HttpRequest
-import net.woggioni.gbcs.api.Role
+import net.woggioni.rbcs.api.Role
 
 class RoleAuthorizer : Authorizer {
 

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt

@@ -1,12 +1,11 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
 import io.netty.buffer.ByteBuf
-import net.woggioni.gbcs.api.Cache
-import net.woggioni.gbcs.common.ByteBufInputStream
-import net.woggioni.gbcs.common.GBCS.digestString
-import net.woggioni.gbcs.common.contextLogger
 import net.woggioni.jwo.JWO
-import net.woggioni.jwo.LockFile
+import net.woggioni.rbcs.api.Cache
+import net.woggioni.rbcs.common.ByteBufInputStream
+import net.woggioni.rbcs.common.RBCS.digestString
+import net.woggioni.rbcs.common.contextLogger
 import java.nio.channels.Channels
 import java.nio.channels.FileChannel
 import java.nio.file.Files
@@ -18,7 +17,6 @@ import java.security.MessageDigest
 import java.time.Duration
 import java.time.Instant
 import java.util.concurrent.CompletableFuture
-import java.util.concurrent.atomic.AtomicReference
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.Inflater
@@ -41,7 +39,10 @@ class FileSystemCache(
         Files.createDirectories(root)
     }
 
-    private var nextGc = AtomicReference(Instant.now().plus(maxAge))
+    @Volatile
+    private var running = true
+
+    private var nextGc = Instant.now()
 
     override fun get(key: String) = (digestAlgorithm
         ?.let(MessageDigest::getInstance)
@@ -67,8 +68,6 @@ class FileSystemCache(
                         FileChannel.open(file, StandardOpenOption.READ)
                     }
                 }
-            }.also {
-                gc()
             }.let {
                 CompletableFuture.completedFuture(it)
             }
@@ -98,33 +97,51 @@ class FileSystemCache(
                 Files.delete(tmpFile)
                 throw t
             }
-        }.also {
-            gc()
         }
         return CompletableFuture.completedFuture(null)
     }
 
+    private val garbageCollector = Thread.ofVirtual().name("file-system-cache-gc").start {
+        while (running) {
+            gc()
+        }
+    }
+
     private fun gc() {
         val now = Instant.now()
-        val oldValue = nextGc.getAndSet(now.plus(maxAge))
-        if (oldValue < now) {
-            actualGc(now)
+        if (nextGc < now) {
+            val oldestEntry = actualGc(now)
+            nextGc = (oldestEntry ?: now).plus(maxAge)
         }
+        Thread.sleep(minOf(Duration.between(now, nextGc), Duration.ofSeconds(1)))
     }
 
-    @Synchronized
-    private fun actualGc(now: Instant) {
-        Files.list(root).filter {
-            val creationTimeStamp = Files.readAttributes(it, BasicFileAttributes::class.java)
-                .creationTime()
-                .toInstant()
-            now > creationTimeStamp.plus(maxAge)
-        }.forEach { file ->
-            LockFile.acquire(file, false).use {
-                Files.delete(file)
+    /**
+     * Returns the creation timestamp of the oldest cache entry (if any)
+     */
+    private fun actualGc(now: Instant) : Instant? {
+        var result :Instant? = null
+        Files.list(root)
+            .filter { path ->
+                JWO.splitExtension(path)
+                    .map { it._2 }
+                    .map { it != ".tmp" }
+                    .orElse(true)
             }
-        }
+            .filter {
+                val creationTimeStamp = Files.readAttributes(it, BasicFileAttributes::class.java)
+                    .creationTime()
+                    .toInstant()
+                if(result == null || creationTimeStamp < result) {
+                    result = creationTimeStamp
+                }
+                now > creationTimeStamp.plus(maxAge)
+            }.forEach(Files::delete)
+        return result
     }
 
-    override fun close() {}
+    override fun close() {
+        running = false
+        garbageCollector.join()
+    }
 }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.common.GBCS
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.common.RBCS
 import net.woggioni.jwo.Application
 import java.nio.file.Path
 import java.time.Duration
@@ -14,14 +14,14 @@ data class FileSystemCacheConfiguration(
     val compressionLevel: Int,
 ) : Configuration.Cache {
     override fun materialize() = FileSystemCache(
-        root ?: Application.builder("gbcs").build().computeCacheDirectory(),
+        root ?: Application.builder("rbcs").build().computeCacheDirectory(),
         maxAge,
         digestAlgorithm,
         compressionEnabled,
         compressionLevel
     )
 
-    override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI
+    override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI
 
     override fun getTypeName() = "fileSystemCacheType"
 }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheProvider.kt

@@ -1,9 +1,9 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
-import net.woggioni.gbcs.api.CacheProvider
-import net.woggioni.gbcs.common.GBCS
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.common.Xml.Companion.renderAttribute
+import net.woggioni.rbcs.api.CacheProvider
+import net.woggioni.rbcs.common.RBCS
+import net.woggioni.rbcs.common.Xml
+import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import java.nio.file.Path
@@ -12,11 +12,11 @@ import java.util.zip.Deflater
 
 class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
 
-    override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/server/schema/gbcs.xsd"
+    override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd"
 
     override fun getXmlType() = "fileSystemCacheType"
 
-    override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server"
+    override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server"
 
     override fun deserialize(el: Element): FileSystemCacheConfiguration {
         val path = el.renderAttribute("path")
@@ -44,8 +44,8 @@ class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
     override fun serialize(doc: Document, cache : FileSystemCacheConfiguration) = cache.run {
         val result = doc.createElement("cache")
         Xml.of(doc, result) {
-            val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI)
-            attr("xs:type", "${prefix}:fileSystemCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI)
+            val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI)
+            attr("xs:type", "${prefix}:fileSystemCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI)
             attr("path", root.toString())
             attr("max-age", maxAge.toString())
             digestAlgorithm?.let { digestAlgorithm ->

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt

@@ -1,12 +1,12 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
 import io.netty.buffer.ByteBuf
-import net.woggioni.gbcs.api.Cache
-import net.woggioni.gbcs.common.ByteBufInputStream
-import net.woggioni.gbcs.common.ByteBufOutputStream
-import net.woggioni.gbcs.common.GBCS.digestString
-import net.woggioni.gbcs.common.contextLogger
 import net.woggioni.jwo.JWO
+import net.woggioni.rbcs.api.Cache
+import net.woggioni.rbcs.common.ByteBufInputStream
+import net.woggioni.rbcs.common.ByteBufOutputStream
+import net.woggioni.rbcs.common.RBCS.digestString
+import net.woggioni.rbcs.common.contextLogger
 import java.nio.channels.Channels
 import java.security.MessageDigest
 import java.time.Duration
@@ -42,9 +42,11 @@ class InMemoryCache(
 
     private val removalQueue = PriorityBlockingQueue<RemovalQueueElement>()
 
+    @Volatile
     private var running = true
-    private val garbageCollector = Thread {
-        while(true) {
+
+    private val garbageCollector = Thread.ofVirtual().name("in-memory-cache-gc").start {
+        while(running) {
             val el = removalQueue.take()
             val buf = el.value
             val now = Instant.now()
@@ -62,8 +64,6 @@ class InMemoryCache(
                 Thread.sleep(minOf(Duration.between(now, el.expiry), Duration.ofSeconds(1)))
             }
         }
-    }.apply {
-        start()
     }
 
     private fun removeEldest() : Long {

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.common.GBCS
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.common.RBCS
 import java.time.Duration
 
 data class InMemoryCacheConfiguration(
@@ -19,7 +19,7 @@ data class InMemoryCacheConfiguration(
         compressionLevel
     )
 
-    override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI
+    override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI
 
     override fun getTypeName() = "inMemoryCacheType"
 }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt

@@ -1,9 +1,9 @@
-package net.woggioni.gbcs.server.cache
+package net.woggioni.rbcs.server.cache
 
-import net.woggioni.gbcs.api.CacheProvider
-import net.woggioni.gbcs.common.GBCS
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.common.Xml.Companion.renderAttribute
+import net.woggioni.rbcs.api.CacheProvider
+import net.woggioni.rbcs.common.RBCS
+import net.woggioni.rbcs.common.Xml
+import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import java.time.Duration
@@ -11,11 +11,11 @@ import java.util.zip.Deflater
 
 class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
 
-    override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/server/schema/gbcs.xsd"
+    override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd"
 
     override fun getXmlType() = "inMemoryCacheType"
 
-    override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server"
+    override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server"
 
     override fun deserialize(el: Element): InMemoryCacheConfiguration {
         val maxAge = el.renderAttribute("max-age")
@@ -44,8 +44,8 @@ class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
     override fun serialize(doc: Document, cache : InMemoryCacheConfiguration) = cache.run {
         val result = doc.createElement("cache")
         Xml.of(doc, result) {
-            val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI)
-            attr("xs:type", "${prefix}:inMemoryCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI)
+            val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI)
+            attr("xs:type", "${prefix}:inMemoryCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI)
             attr("max-age", maxAge.toString())
             attr("max-size", maxSize.toString())
             digestAlgorithm?.let { digestAlgorithm ->

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/CacheSerializers.kt

@@ -1,7 +1,7 @@
-package net.woggioni.gbcs.server.configuration
+package net.woggioni.rbcs.server.configuration
 
-import net.woggioni.gbcs.api.CacheProvider
-import net.woggioni.gbcs.api.Configuration
+import net.woggioni.rbcs.api.CacheProvider
+import net.woggioni.rbcs.api.Configuration
 import java.util.ServiceLoader
 
 object CacheSerializers {

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Parser.kt

@@ -1,20 +1,20 @@
-package net.woggioni.gbcs.server.configuration
+package net.woggioni.rbcs.server.configuration
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.Configuration.Authentication
-import net.woggioni.gbcs.api.Configuration.BasicAuthentication
-import net.woggioni.gbcs.api.Configuration.Cache
-import net.woggioni.gbcs.api.Configuration.ClientCertificateAuthentication
-import net.woggioni.gbcs.api.Configuration.Group
-import net.woggioni.gbcs.api.Configuration.KeyStore
-import net.woggioni.gbcs.api.Configuration.Tls
-import net.woggioni.gbcs.api.Configuration.TlsCertificateExtractor
-import net.woggioni.gbcs.api.Configuration.TrustStore
-import net.woggioni.gbcs.api.Configuration.User
-import net.woggioni.gbcs.api.Role
-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.rbcs.api.Configuration
+import net.woggioni.rbcs.api.Configuration.Authentication
+import net.woggioni.rbcs.api.Configuration.BasicAuthentication
+import net.woggioni.rbcs.api.Configuration.Cache
+import net.woggioni.rbcs.api.Configuration.ClientCertificateAuthentication
+import net.woggioni.rbcs.api.Configuration.Group
+import net.woggioni.rbcs.api.Configuration.KeyStore
+import net.woggioni.rbcs.api.Configuration.Tls
+import net.woggioni.rbcs.api.Configuration.TlsCertificateExtractor
+import net.woggioni.rbcs.api.Configuration.TrustStore
+import net.woggioni.rbcs.api.Configuration.User
+import net.woggioni.rbcs.api.Role
+import net.woggioni.rbcs.api.exception.ConfigurationException
+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
 import org.w3c.dom.TypeInfo

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Serializer.kt

@@ -1,9 +1,9 @@
-package net.woggioni.gbcs.server.configuration
+package net.woggioni.rbcs.server.configuration
 
-import net.woggioni.gbcs.api.CacheProvider
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.common.GBCS
-import net.woggioni.gbcs.common.Xml
+import net.woggioni.rbcs.api.CacheProvider
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.common.RBCS
+import net.woggioni.rbcs.common.Xml
 import org.w3c.dom.Document
 
 object Serializer {
@@ -19,10 +19,10 @@ object Serializer {
         val schemaLocations = CacheSerializers.index.values.asSequence().map {
             it.xmlNamespace to it.xmlSchemaLocation
         }.toMap()
-        return Xml.of(GBCS.GBCS_NAMESPACE_URI, GBCS.GBCS_PREFIX + ":server") {
+        return Xml.of(RBCS.RBCS_NAMESPACE_URI, RBCS.RBCS_PREFIX + ":server") {
 //            attr("xmlns:xs", GradleBuildCacheServer.XML_SCHEMA_NAMESPACE_URI)
             val value = schemaLocations.asSequence().map { (k, v) -> "$k $v" }.joinToString(" ")
-            attr("xs:schemaLocation", value , namespaceURI = GBCS.XML_SCHEMA_NAMESPACE_URI)
+            attr("xs:schemaLocation", value , namespaceURI = RBCS.XML_SCHEMA_NAMESPACE_URI)
 
             conf.serverPath
                 ?.takeIf(String::isNotEmpty)

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.exception
+package net.woggioni.rbcs.server.exception
 
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
@@ -13,10 +13,12 @@ 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 net.woggioni.gbcs.api.exception.CacheException
-import net.woggioni.gbcs.api.exception.ContentTooLargeException
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.common.debug
+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 java.net.SocketException
+import javax.net.ssl.SSLException
 import javax.net.ssl.SSLPeerUnverifiedException
 
 @ChannelHandler.Sharable
@@ -50,7 +52,12 @@ class ExceptionHandler : ChannelDuplexHandler() {
     override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
         when (cause) {
             is DecoderException -> {
-                log.error(cause.message, cause)
+                log.debug(cause.message, cause)
+                ctx.close()
+            }
+
+            is SocketException -> {
+                log.debug(cause.message, cause)
                 ctx.close()
             }
 
@@ -59,10 +66,16 @@ class ExceptionHandler : ChannelDuplexHandler() {
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }
 
+            is SSLException -> {
+                log.debug(cause.message, cause)
+                ctx.close()
+            }
+
             is ContentTooLargeException -> {
                 ctx.writeAndFlush(TOO_BIG.retainedDuplicate())
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }
+
             is ReadTimeoutException -> {
                 log.debug {
                     val channelId = ctx.channel().id().asShortText()
@@ -70,6 +83,7 @@ class ExceptionHandler : ChannelDuplexHandler() {
                 }
                 ctx.close()
             }
+
             is WriteTimeoutException -> {
                 log.debug {
                     val channelId = ctx.channel().id().asShortText()
@@ -77,11 +91,13 @@ class ExceptionHandler : ChannelDuplexHandler() {
                 }
                 ctx.close()
             }
+
             is CacheException -> {
                 log.error(cause.message, cause)
                 ctx.writeAndFlush(NOT_AVAILABLE.retainedDuplicate())
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }
+
             else -> {
                 log.error(cause.message, cause)
                 ctx.writeAndFlush(SERVER_ERROR.retainedDuplicate())

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.handler
+package net.woggioni.rbcs.server.handler
 
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelFutureListener
@@ -16,10 +16,10 @@ import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpUtil
 import io.netty.handler.codec.http.LastHttpContent
 import io.netty.handler.stream.ChunkedNioStream
-import net.woggioni.gbcs.api.Cache
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.server.debug
-import net.woggioni.gbcs.server.warn
+import net.woggioni.rbcs.api.Cache
+import net.woggioni.rbcs.common.contextLogger
+import net.woggioni.rbcs.server.debug
+import net.woggioni.rbcs.server.warn
 import java.nio.channels.FileChannel
 import java.nio.file.Path
 

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt

@@ -1,6 +1,6 @@
-package net.woggioni.gbcs.server.throttling
+package net.woggioni.rbcs.server.throttling
 
-import net.woggioni.gbcs.api.Configuration
+import net.woggioni.rbcs.api.Configuration
 import net.woggioni.jwo.Bucket
 import java.net.InetSocketAddress
 import java.util.Arrays

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.throttling
+package net.woggioni.rbcs.server.throttling
 
 import io.netty.channel.ChannelHandler.Sharable
 import io.netty.channel.ChannelHandlerContext
@@ -7,9 +7,9 @@ import io.netty.handler.codec.http.DefaultFullHttpResponse
 import io.netty.handler.codec.http.HttpHeaderNames
 import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpVersion
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.common.contextLogger
-import net.woggioni.gbcs.server.GradleBuildCacheServer
+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 java.net.InetSocketAddress
@@ -19,10 +19,13 @@ import java.util.concurrent.TimeUnit
 
 
 @Sharable
-class ThrottlingHandler(cfg: Configuration) :
-    ChannelInboundHandlerAdapter() {
+class ThrottlingHandler(cfg: Configuration) : ChannelInboundHandlerAdapter() {
+
+    private companion object {
+        @JvmStatic
+        private val log = contextLogger()
+    }
 
-    private val log = contextLogger()
     private val bucketManager = BucketManager.from(cfg)
 
     private val connectionConfiguration = cfg.connection
@@ -40,11 +43,11 @@ class ThrottlingHandler(cfg: Configuration) :
 
     override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
         val buckets = mutableListOf<Bucket>()
-        val user = ctx.channel().attr(GradleBuildCacheServer.userAttribute).get()
+        val user = ctx.channel().attr(RemoteBuildCacheServer.userAttribute).get()
         if (user != null) {
             bucketManager.getBucketByUser(user)?.let(buckets::addAll)
         }
-        val groups = ctx.channel().attr(GradleBuildCacheServer.groupAttribute).get() ?: emptySet()
+        val groups = ctx.channel().attr(RemoteBuildCacheServer.groupAttribute).get() ?: emptySet()
         if (groups.isNotEmpty()) {
             groups.forEach { group ->
                 bucketManager.getBucketByGroup(group)?.let(buckets::add)
@@ -60,7 +63,7 @@ class ThrottlingHandler(cfg: Configuration) :
         }
     }
 
-    private fun handleBuckets(buckets : List<Bucket>, ctx : ChannelHandlerContext, msg : Any, delayResponse : Boolean) {
+    private fun handleBuckets(buckets: List<Bucket>, ctx: ChannelHandlerContext, msg: Any, delayResponse: Boolean) {
         var nextAttempt = -1L
         for (bucket in buckets) {
             val bucketNextAttempt = bucket.removeTokensWithEstimate(1)
@@ -68,17 +71,17 @@ class ThrottlingHandler(cfg: Configuration) :
                 nextAttempt = bucketNextAttempt
             }
         }
-        if(nextAttempt < 0) {
+        if (nextAttempt < 0) {
             super.channelRead(ctx, msg)
-            return
-        }
-        val waitDuration = Duration.of(LongMath.ceilDiv(nextAttempt, 100_000_000L) * 100L, ChronoUnit.MILLIS)
-        if (delayResponse && waitDuration < waitThreshold) {
-            ctx.executor().schedule({
-                handleBuckets(buckets, ctx, msg, false)
-            }, waitDuration.toMillis(), TimeUnit.MILLISECONDS)
         } else {
-            sendThrottledResponse(ctx, waitDuration)
+            val waitDuration = Duration.of(LongMath.ceilDiv(nextAttempt, 100_000_000L) * 100L, ChronoUnit.MILLIS)
+            if (delayResponse && waitDuration < waitThreshold) {
+                ctx.executor().schedule({
+                    handleBuckets(buckets, ctx, msg, false)
+                }, waitDuration.toMillis(), TimeUnit.MILLISECONDS)
+            } else {
+                sendThrottledResponse(ctx, waitDuration)
+            }
         }
     }
 

rbcs-server/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider

@@ -0,0 +1,2 @@
+net.woggioni.rbcs.server.cache.FileSystemCacheProvider
+net.woggioni.rbcs.server.cache.InMemoryCacheProvider

rbcs-server/src/main/resources/net/woggioni/rbcs/server/rbcs-default.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs:server
+<rbcs:server
              xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:gbcs="urn:net.woggioni.gbcs.server"
-             xs:schemaLocation="urn:net.woggioni.gbcs.server jpms://net.woggioni.gbcs.server/net/woggioni/gbcs/server/schema/gbcs.xsd">
+             xmlns:rbcs="urn:net.woggioni.rbcs.server"
+             xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs.xsd">
     <bind host="127.0.0.1" port="8080" incoming-connections-backlog-size="1024"/>
     <connection
             max-request-size="67108864"
@@ -12,8 +12,8 @@
             read-idle-timeout="PT60S"
             write-idle-timeout="PT60S"/>
     <event-executor use-virtual-threads="true"/>
-    <cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
+    <cache xs:type="rbcs:fileSystemCacheType" path="/tmp/rbcs" max-age="P7D"/>
     <authentication>
         <none/>
     </authentication>
-</gbcs:server>
+</rbcs:server>

rbcs-server/src/main/resources/net/woggioni/rbcs/server/schema/rbcs.xsd

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema targetNamespace="urn:net.woggioni.gbcs.server"
+<xs:schema targetNamespace="urn:net.woggioni.rbcs.server"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:gbcs="urn:net.woggioni.gbcs.server"
+           xmlns:rbcs="urn:net.woggioni.rbcs.server"
            elementFormDefault="unqualified">
-    <xs:element name="server" type="gbcs:serverType"/>
+    <xs:element name="server" type="rbcs:serverType"/>
 
     <xs:complexType name="serverType">
         <xs:sequence minOccurs="0">
-            <xs:element name="bind" type="gbcs:bindType" maxOccurs="1"/>
-            <xs:element name="connection" type="gbcs:connectionType" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="event-executor" type="gbcs:eventExecutorType" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="cache" type="gbcs:cacheType" maxOccurs="1"/>
-            <xs:element name="authorization" type="gbcs:authorizationType" minOccurs="0">
+            <xs:element name="bind" type="rbcs:bindType" maxOccurs="1"/>
+            <xs:element name="connection" type="rbcs:connectionType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="event-executor" type="rbcs:eventExecutorType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="cache" type="rbcs:cacheType" maxOccurs="1"/>
+            <xs:element name="authorization" type="rbcs:authorizationType" minOccurs="0">
                 <xs:key name="userId">
                     <xs:selector xpath="users/user"/>
                     <xs:field xpath="@name"/>
                 </xs:key>
-                <xs:keyref name="userRef" refer="gbcs:userId">
+                <xs:keyref name="userRef" refer="rbcs:userId">
                     <xs:selector xpath="groups/group/users/user"/>
                     <xs:field xpath="@ref"/>
                 </xs:keyref>
             </xs:element>
-            <xs:element name="authentication" type="gbcs:authenticationType" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="tls" type="gbcs:tlsType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="authentication" type="rbcs:authenticationType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="tls" type="rbcs:tlsType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="path" type="xs:string" use="optional"/>
     </xs:complexType>
@@ -50,7 +50,7 @@
 
     <xs:complexType name="inMemoryCacheType">
         <xs:complexContent>
-            <xs:extension base="gbcs:cacheType">
+            <xs:extension base="rbcs:cacheType">
                 <xs:attribute name="max-age" type="xs:duration" default="P1D"/>
                 <xs:attribute name="max-size" type="xs:token" default="0x1000000"/>
                 <xs:attribute name="digest" type="xs:token" default="MD5"/>
@@ -62,7 +62,7 @@
 
     <xs:complexType name="fileSystemCacheType">
         <xs:complexContent>
-            <xs:extension base="gbcs:cacheType">
+            <xs:extension base="rbcs:cacheType">
                 <xs:attribute name="path" type="xs:string" use="required"/>
                 <xs:attribute name="max-age" type="xs:duration" default="P1D"/>
                 <xs:attribute name="digest" type="xs:token" default="MD5"/>
@@ -74,8 +74,8 @@
 
     <xs:complexType name="tlsCertificateAuthorizationType">
         <xs:sequence>
-            <xs:element name="group-extractor" type="gbcs:X500NameExtractorType" minOccurs="0"/>
-            <xs:element name="user-extractor" type="gbcs:X500NameExtractorType" minOccurs="0"/>
+            <xs:element name="group-extractor" type="rbcs:X500NameExtractorType" minOccurs="0"/>
+            <xs:element name="user-extractor" type="rbcs:X500NameExtractorType" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -86,8 +86,8 @@
 
     <xs:complexType name="authorizationType">
         <xs:all>
-            <xs:element name="users" type="gbcs:usersType"/>
-            <xs:element name="groups" type="gbcs:groupsType">
+            <xs:element name="users" type="rbcs:usersType"/>
+            <xs:element name="groups" type="rbcs:groupsType">
                 <xs:unique name="groupKey">
                     <xs:selector xpath="group"/>
                     <xs:field xpath="@name"/>
@@ -99,7 +99,7 @@
     <xs:complexType name="authenticationType">
         <xs:choice>
             <xs:element name="basic"/>
-            <xs:element name="client-certificate" type="gbcs:tlsCertificateAuthorizationType"/>
+            <xs:element name="client-certificate" type="rbcs:tlsCertificateAuthorizationType"/>
             <xs:element name="none"/>
         </xs:choice>
     </xs:complexType>
@@ -113,13 +113,13 @@
 
     <xs:complexType name="anonymousUserType">
         <xs:sequence>
-            <xs:element name="quota" type="gbcs:quotaType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="quota" type="rbcs:quotaType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="userType">
         <xs:sequence>
-            <xs:element name="quota" type="gbcs:quotaType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="quota" type="rbcs:quotaType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:token" use="required"/>
         <xs:attribute name="password" type="xs:string" use="optional"/>
@@ -127,28 +127,28 @@
 
     <xs:complexType name="usersType">
         <xs:sequence>
-            <xs:element name="user" type="gbcs:userType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="anonymous" type="gbcs:anonymousUserType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="user" type="rbcs:userType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="anonymous" type="rbcs:anonymousUserType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="groupsType">
         <xs:sequence>
-            <xs:element name="group" type="gbcs:groupType" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="group" type="rbcs:groupType" maxOccurs="unbounded" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="groupType">
         <xs:sequence>
-            <xs:element name="users" type="gbcs:userRefsType" maxOccurs="1" minOccurs="0">
+            <xs:element name="users" type="rbcs:userRefsType" maxOccurs="1" minOccurs="0">
                 <xs:unique name="userRefWriterKey">
                     <xs:selector xpath="user"/>
                     <xs:field xpath="@ref"/>
                 </xs:unique>
             </xs:element>
-            <xs:element name="roles" type="gbcs:rolesType" maxOccurs="1" minOccurs="0"/>
-            <xs:element name="user-quota" type="gbcs:quotaType" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="group-quota" type="gbcs:quotaType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="roles" type="rbcs:rolesType" maxOccurs="1" minOccurs="0"/>
+            <xs:element name="user-quota" type="rbcs:quotaType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="group-quota" type="rbcs:quotaType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:token"/>
     </xs:complexType>
@@ -171,7 +171,7 @@
 
     <xs:complexType name="userRefsType">
         <xs:sequence>
-                <xs:element name="user" type="gbcs:userRefType" maxOccurs="unbounded" minOccurs="0"/>
+                <xs:element name="user" type="rbcs:userRefType" maxOccurs="unbounded" minOccurs="0"/>
                 <xs:element name="anonymous" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
@@ -182,8 +182,8 @@
 
     <xs:complexType name="tlsType">
         <xs:all>
-            <xs:element name="keystore" type="gbcs:keyStoreType" />
-            <xs:element name="truststore" type="gbcs:trustStoreType" minOccurs="0"/>
+            <xs:element name="keystore" type="rbcs:keyStoreType" />
+            <xs:element name="truststore" type="rbcs:trustStoreType" minOccurs="0"/>
         </xs:all>
     </xs:complexType>
 
@@ -203,7 +203,7 @@
 
     <xs:complexType name="propertiesType">
         <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="property" type="gbcs:propertyType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="property" type="rbcs:propertyType"/>
         </xs:sequence>
     </xs:complexType>
 

rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/CertificateUtils.java

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.test.utils;
+package net.woggioni.rbcs.server.test.utils;
 
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.x500.X500Name;

rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/NetworkUtils.java

@@ -1,4 +1,4 @@
-package net.woggioni.gbcs.server.test.utils;
+package net.woggioni.rbcs.server.test.utils;
 
 import net.woggioni.jwo.JWO;
 

rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractBasicAuthServerTest.kt

@@ -1,11 +1,11 @@
-package net.woggioni.gbcs.server.test
+package net.woggioni.rbcs.server.test
 
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.Role
-import net.woggioni.gbcs.common.Xml
-import net.woggioni.gbcs.server.cache.FileSystemCacheConfiguration
-import net.woggioni.gbcs.server.configuration.Serializer
-import net.woggioni.gbcs.server.test.utils.NetworkUtils
+import net.woggioni.rbcs.api.Configuration
+import net.woggioni.rbcs.api.Role
+import net.woggioni.rbcs.common.Xml
+import net.woggioni.rbcs.server.cache.FileSystemCacheConfiguration
+import net.woggioni.rbcs.server.configuration.Serializer
+import net.woggioni.rbcs.server.test.utils.NetworkUtils
 import java.net.URI
 import java.net.http.HttpRequest
 import java.nio.charset.StandardCharsets
@@ -23,7 +23,7 @@ abstract class AbstractBasicAuthServerTest : AbstractServerTest() {
 
     protected val random = Random(101325)
     protected val keyValuePair = newEntry(random)
-    protected val serverPath = "gbcs"
+    protected val serverPath = "rbcs"
     protected val readersGroup = Configuration.Group("readers", setOf(Role.Reader), null, null)
     protected val writersGroup = Configuration.Group("writers", setOf(Role.Writer), null, null)