feat(shulker-proxy-agent): proper support of cluster reconnection

jeremylvln · Aug 24, 2024 · 9fb9e64 · 9fb9e64
1 parent 8c6502b
commit 9fb9e64
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/gradle/detekt-config.yml b/gradle/detekt-config.yml
@@ -14,3 +14,9 @@ style:
     ignoreOverridden: true
   ReturnCount:
     active: false
+  ForbiddenComment:
+    active: false
+
+potential-bugs:
+  UnsafeCallOnNullableType:
+    active: false
diff --git a/...common/kotlin/io/shulkermc/proxyagent/adapters/kubernetes/ImplKubernetesGatewayAdapter.kt b/...common/kotlin/io/shulkermc/proxyagent/adapters/kubernetes/ImplKubernetesGatewayAdapter.kt
@@ -59,7 +59,7 @@ class ImplKubernetesGatewayAdapter(proxyNamespace: String, proxyName: String) :
                 .withName(Configuration.PROXY_FLEET_NAME)
                 .get()
 
-        if (service.spec.type !== "LoadBalancer") {
+        if (service.spec.type != "LoadBalancer") {
             return Optional.empty()
         }
 

diff --git a/...r-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/services/ProxyLifecycleService.kt b/...r-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/services/ProxyLifecycleService.kt
@@ -14,7 +14,7 @@ class ProxyLifecycleService(private val agent: ShulkerProxyAgentCommon) {
     }
 
     private val ttlTask: ProxyInterface.ScheduledTask
-    private var drainingFuture: CompletableFuture<Void>? = null
+    private var drainingFuture: CompletableFuture<Unit>? = null
 
     init {
         this.agent.kubernetesGateway.watchProxyEvents { action, proxy ->
@@ -40,15 +40,15 @@ class ProxyLifecycleService(private val agent: ShulkerProxyAgentCommon) {
         this.ttlTask.cancel()
     }
 
-    fun drain(): CompletableFuture<Void> {
+    fun drain(): CompletableFuture<Unit> {
         if (this.drainingFuture != null) {
             return this.drainingFuture!!
         }
 
-        this.drainingFuture = CompletableFuture<Void>()
+        this.drainingFuture = CompletableFuture<Unit>()
         this.agent.fileSystem.createDrainLock()
 
-        // FIXME: Rather than hardcoding a task, wait for Kubernetes to
+        // TODO: Rather than hardcoding a task, wait for Kubernetes to
         // exclude the proxy from the Service.
         this.agent.proxyInterface.scheduleDelayedTask(
             @Suppress("MagicNumber") 30L,
@@ -59,7 +59,7 @@ class ProxyLifecycleService(private val agent: ShulkerProxyAgentCommon) {
 
         this.agent.logger.info("Proxy is now draining")
 
-        return this.drainingFuture!!.thenAccept {
+        return this.drainingFuture!!.thenApply {
             this.onExcludedFromKubernetes()
         }
     }