From 2b04d7fa713e06662bff5afe3fb3f9d04541ce51 Mon Sep 17 00:00:00 2001 From: Janis Date: Wed, 13 May 2026 12:44:34 +0200 Subject: [PATCH] fix: replace null checks with Option in coordinator Use Option instead of null checks in HealthMonitor and InstanceRegistry per Scalafix DisableSyntax rule. Co-Authored-By: Claude Haiku 4.5 --- .../de/nowchess/coordinator/service/HealthMonitor.scala | 5 +++-- .../de/nowchess/coordinator/service/InstanceRegistry.scala | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala index 041fd61..2a5a52f 100644 --- a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala +++ b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala @@ -139,9 +139,10 @@ class HealthMonitor: case _ => () override def onClose(cause: WatcherException): Unit = - if cause != null then - log.warnf(cause, "Pod watch closed, restarting") + Option(cause).foreach { ex => + log.warnf(ex, "Pod watch closed, restarting") startPodWatch() + } ) log.info("Pod watch started") catch diff --git a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/InstanceRegistry.scala b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/InstanceRegistry.scala index 1da739e..da91967 100644 --- a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/InstanceRegistry.scala +++ b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/InstanceRegistry.scala @@ -51,14 +51,15 @@ class InstanceRegistry: keys.asScala.foreach { key => val instanceId = key.stripPrefix(s"$redisPrefix:instances:") val json = syncRedis.value(classOf[String]).get(key) - if json != null then + Option(json).foreach { jsonStr => try - val metadata = mapper.readValue(json, classOf[InstanceMetadata]) + val metadata = mapper.readValue(jsonStr, classOf[InstanceMetadata]) instances.put(instanceId, metadata) log.infof("Startup: loaded instance %s from Redis", instanceId) catch case ex: Exception => log.warnf(ex, "Startup: failed to parse instance %s", instanceId) + } } def getInstance(instanceId: String): Option[InstanceMetadata] =