From 836a9b41f74a1c1777888238ac5da0ac7e2c8314 Mon Sep 17 00:00:00 2001
From: Thayne McCombs <thayne@lucidchart.com>
Date: Thu, 20 Feb 2025 11:49:29 -0700
Subject: [PATCH] Code review updates

---
 admin/app/com/lucidchart/piezo/GeneratorClassLoader.scala | 2 +-
 .../piezo/admin/controllers/JobDataHelper.scala           | 2 +-
 .../piezo/admin/controllers/TriggerFormHelper.scala       | 2 +-
 worker/src/main/scala/com/lucidchart/piezo/Worker.scala   | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/app/com/lucidchart/piezo/GeneratorClassLoader.scala b/admin/app/com/lucidchart/piezo/GeneratorClassLoader.scala
index 02276dd..ca65cee 100644
--- a/admin/app/com/lucidchart/piezo/GeneratorClassLoader.scala
+++ b/admin/app/com/lucidchart/piezo/GeneratorClassLoader.scala
@@ -47,7 +47,7 @@ class GeneratorClassLoader extends ClassLoader(classOf[GeneratorClassLoader].get
 
   def getClassLoader: GeneratorClassLoader = this
 
-  def loadClass[T](name: String, clazz: Class[T]): Class[_ <: T] = loadClass(name).asInstanceOf[Class[_ <: T]]
+  def loadClass[T](name: String, clazz: Class[T]): Class[? <: T] = loadClass(name).asInstanceOf[Class[? <: T]]
 
   def initialize() = ()
 
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/JobDataHelper.scala b/admin/app/com/lucidchart/piezo/admin/controllers/JobDataHelper.scala
index 81d7966..fe37427 100644
--- a/admin/app/com/lucidchart/piezo/admin/controllers/JobDataHelper.scala
+++ b/admin/app/com/lucidchart/piezo/admin/controllers/JobDataHelper.scala
@@ -34,7 +34,7 @@ trait JobDataHelper {
 
   implicit def jobDataMap: Mapping[Option[JobDataMap]] =
     optional(
-      list(mapping("key" -> text, "value" -> text)(DataMap.apply)(r => Some((r.key, r.value))))
+      list(mapping("key" -> text, "value" -> text)(DataMap.apply)(data => Some((data.key, data.value))))
         .transform(mapToJobData, jobDataToMap),
     )
 
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala b/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala
index 6246716..cdfc191 100644
--- a/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala
+++ b/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala
@@ -180,7 +180,7 @@ class TriggerFormHelper(scheduler: Scheduler, monitoringTeams: MonitoringTeams)
 }
 
 object MaxSecondsBetweenSuccessesFormatter extends Formatter[Int] {
-  override val format: Option[(String, Seq[Nothing])] = Some(("format.triggerMaxErrorTime", Nil))
+  override val format: Option[(String, Seq[Any])] = Some(("format.triggerMaxErrorTime", Nil))
   override def bind(key: String, data: Map[String, String]): Either[Seq[FormError], Int] = {
     for {
       maxSecondsBetweenSuccesses <- parsing(_.toInt, "Numeric value expected", Nil)(key, data)
diff --git a/worker/src/main/scala/com/lucidchart/piezo/Worker.scala b/worker/src/main/scala/com/lucidchart/piezo/Worker.scala
index e4aed8d..9154d96 100644
--- a/worker/src/main/scala/com/lucidchart/piezo/Worker.scala
+++ b/worker/src/main/scala/com/lucidchart/piezo/Worker.scala
@@ -72,11 +72,11 @@ object Worker {
               val currentJobs: Int = scheduler.getCurrentlyExecutingJobs.size
               logger.info("worker heartbeat - currently running " + currentJobs + " jobs")
             }
-          if(reader.ready && System.in.read == -1){
-              logger.info("Received EOF on stdin")
-              runSemaphore.release()
+            if (reader.ready && System.in.read == -1){
+                logger.info("Received EOF on stdin")
+                runSemaphore.release()
+              }
             }
-          }
         }
         catch {
           case e: InterruptedException => logger.error("caught interruption exception: " + e)