[api]: Fixes & improvements

tiagohm · Oct 9, 2024 · aec0e2e · aec0e2e
1 parent aafe107
commit aec0e2e
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 43 deletions.
diff --git a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusController.kt b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusController.kt
@@ -4,6 +4,7 @@ import io.javalin.Javalin
 import io.javalin.http.Context
 import io.javalin.http.bodyAsClass
 import nebulosa.api.connection.ConnectionService
+import nebulosa.api.javalin.notNull
 
 class AutoFocusController(
     app: Javalin,
@@ -18,19 +19,19 @@ class AutoFocusController(
     }
 
     private fun start(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
-        val focuser = connectionService.focuser(ctx.pathParam("focuser"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
+        val focuser = connectionService.focuser(ctx.pathParam("focuser")).notNull()
         val body = ctx.bodyAsClass<AutoFocusRequest>()
         autoFocusService.start(camera, focuser, body)
     }
 
     private fun stop(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         autoFocusService.stop(camera)
     }
 
     private fun status(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         autoFocusService.status(camera)?.also(ctx::json)
     }
 }
diff --git a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusJob.kt b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusJob.kt
@@ -179,8 +179,8 @@ data class AutoFocusJob(
             }
 
             val predictedFocusPoint = status.determinedFocusPoint ?: determineFinalFocusPoint()
-            val (minX, minY) = if (focusPoints.isEmpty()) CurvePoint.ZERO else focusPoints[0]
-            val (maxX, maxY) = if (focusPoints.isEmpty()) CurvePoint.ZERO else focusPoints[focusPoints.lastIndex]
+            val (minX, minY) = if (isEmpty()) CurvePoint.ZERO else first()
+            val (maxX, maxY) = if (isEmpty()) CurvePoint.ZERO else last()
             status.chart = AutoFocusEvent.Chart(predictedFocusPoint, minX, minY, maxX, maxY, trendLineCurve, parabolicCurve, hyperbolicCurve)
 
             status.state = AutoFocusState.CURVE_FITTED
@@ -191,7 +191,7 @@ data class AutoFocusJob(
 
     private fun determineFinalFocusPoint(): CurvePoint? {
         return when (request.fittingMode) {
-            AutoFocusFittingMode.TRENDLINES -> trendLineCurve!!.intersection
+            AutoFocusFittingMode.TRENDLINES -> trendLineCurve?.intersection
             AutoFocusFittingMode.PARABOLIC -> parabolicCurve?.minimum
             AutoFocusFittingMode.TREND_PARABOLIC -> parabolicCurve?.minimum?.midPoint(trendLineCurve!!.intersection)
             AutoFocusFittingMode.HYPERBOLIC -> hyperbolicCurve?.minimum

diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt
@@ -36,7 +36,7 @@ class CameraController(
 
     private fun camera(ctx: Context) {
         val id = ctx.pathParam("id")
-        val camera = connectionService.camera(id)!!
+        val camera = connectionService.camera(id).notNull()
         ctx.json(camera)
     }
 

diff --git a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt
@@ -4,6 +4,7 @@ import io.javalin.Javalin
 import io.javalin.http.Context
 import io.javalin.http.bodyAsClass
 import nebulosa.api.connection.ConnectionService
+import nebulosa.api.javalin.notNull
 import nebulosa.api.javalin.valid
 
 class SequencerController(
@@ -21,7 +22,7 @@ class SequencerController(
     }
 
     private fun start(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         val mount = ctx.queryParam("mount")?.let(connectionService::mount)
         val wheel = ctx.queryParam("wheel")?.let(connectionService::wheel)
         val focuser = ctx.queryParam("focuser")?.let(connectionService::focuser)
@@ -46,7 +47,7 @@ class SequencerController(
     }
 
     fun status(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         sequencerService.status(camera)?.also(ctx::json)
     }
 }
diff --git a/api/src/main/kotlin/nebulosa/api/stacker/StackerService.kt b/api/src/main/kotlin/nebulosa/api/stacker/StackerService.kt
@@ -132,7 +132,7 @@ class StackerService(private val messageService: MessageService?) {
         else if (path.isXisf()) path.xisf()
         else return null
 
-        return image.use { it.firstOrNull { it is ImageHdu }?.header }?.let(::AnalyzedTarget)
+        return image.use { it.firstOrNull { hdu -> hdu is ImageHdu }?.header }?.let(::AnalyzedTarget)
     }
 
     private inner class AutoStackerMessageHandler(

diff --git a/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardController.kt b/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardController.kt
@@ -4,6 +4,7 @@ import io.javalin.Javalin
 import io.javalin.http.Context
 import io.javalin.http.bodyAsClass
 import nebulosa.api.connection.ConnectionService
+import nebulosa.api.javalin.notNull
 import nebulosa.api.javalin.valid
 
 class FlatWizardController(
@@ -19,18 +20,18 @@ class FlatWizardController(
     }
 
     private fun start(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         val body = ctx.bodyAsClass<FlatWizardRequest>().valid()
         flatWizardService.start(camera, body)
     }
 
     private fun stop(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         flatWizardService.stop(camera)
     }
 
     private fun status(ctx: Context) {
-        val camera = connectionService.camera(ctx.pathParam("camera"))!!
+        val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         flatWizardService.status(camera)?.also(ctx::json)
     }
 }
diff --git a/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/mounts/ASCOMMount.kt b/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/mounts/ASCOMMount.kt
@@ -270,7 +270,7 @@ data class ASCOMMount(
         longitude = 0.0
         latitude = 0.0
         elevation = 0.0
-        dateTime = OffsetDateTime.now(SystemClock)!!
+        dateTime = OffsetDateTime.now(SystemClock)
 
         axisRates.clear()
     }

diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/INDIDevice.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/INDIDevice.kt
@@ -90,8 +90,8 @@ internal abstract class INDIDevice : Device {
                     is DefNumberVector -> {
                         val properties = LinkedHashMap<String, NumberProperty>()
 
-                        for (e in message) {
-                            val property = NumberProperty(e.name, e.label, e.value)
+                        for ((name, label, value) in message) {
+                            val property = NumberProperty(name, label, value)
                             properties[property.name] = property
                         }
 
@@ -105,8 +105,8 @@ internal abstract class INDIDevice : Device {
                     is DefSwitchVector -> {
                         val properties = LinkedHashMap<String, SwitchProperty>()
 
-                        for (e in message) {
-                            val property = SwitchProperty(e.name, e.label, e.value)
+                        for ((name, label, value) in message) {
+                            val property = SwitchProperty(name, label, value)
                             properties[property.name] = property
                         }
 
@@ -120,8 +120,8 @@ internal abstract class INDIDevice : Device {
                     is DefTextVector -> {
                         val properties = LinkedHashMap<String, TextProperty>()
 
-                        for (e in message) {
-                            val property = TextProperty(e.name, e.label, e.value)
+                        for ((name, label, value) in message) {
+                            val property = TextProperty(name, label, value)
                             properties[property.name] = property
                         }
 
@@ -147,9 +147,9 @@ internal abstract class INDIDevice : Device {
 
                         vector.state = message.state
 
-                        for (e in message) {
-                            val property = vector[e.name] ?: continue
-                            property.value = e.value
+                        for ((name, value) in message) {
+                            val property = vector[name] ?: continue
+                            property.value = value
                         }
 
                         vector
@@ -159,9 +159,9 @@ internal abstract class INDIDevice : Device {
 
                         vector.state = message.state
 
-                        for (e in message) {
-                            val property = vector[e.name] ?: continue
-                            property.value = e.value
+                        for ((name, value) in message) {
+                            val property = vector[name] ?: continue
+                            property.value = value
                         }
 
                         vector
@@ -171,9 +171,9 @@ internal abstract class INDIDevice : Device {
 
                         vector.state = message.state
 
-                        for (e in message) {
-                            val property = vector[e.name] ?: continue
-                            property.value = e.value
+                        for ((name, value) in message) {
+                            val property = vector[name] ?: continue
+                            property.value = value
                         }
 
                         vector

diff --git a/nebulosa-phd2-client/src/main/kotlin/nebulosa/phd2/client/PHD2Client.kt b/nebulosa-phd2-client/src/main/kotlin/nebulosa/phd2/client/PHD2Client.kt
@@ -70,9 +70,9 @@ class PHD2Client : NettyClient() {
 
         @JvmStatic private val LOG = loggerFor<PHD2Client>()
 
-        @JvmStatic private val MODULE = kotlinModule().also {
-            it.addDeserializer(GuideState::class.java, GuideStateDeserializer)
-            it.addSerializer(GuideStateSerializer)
+        @JvmStatic private val MODULE = with(kotlinModule()) {
+            addDeserializer(GuideState::class.java, GuideStateDeserializer)
+            addSerializer(GuideStateSerializer)
         }
 
         @JvmStatic private val JSON_MAPPER = jsonMapper {

diff --git a/nebulosa-phd2-client/src/main/kotlin/nebulosa/phd2/client/events/GuideStateDeserializer.kt b/nebulosa-phd2-client/src/main/kotlin/nebulosa/phd2/client/events/GuideStateDeserializer.kt
@@ -7,6 +7,8 @@ import nebulosa.guiding.GuideState
 
 data object GuideStateDeserializer : StdDeserializer<GuideState>(GuideState::class.java) {
 
+    private fun readResolve(): Any = GuideStateDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): GuideState? {
         return p.valueAsString?.let(GUIDE_STATE_NAMES::get)
     }

diff --git a/nebulosa-test/src/main/kotlin/nebulosa/test/Http.kt b/nebulosa-test/src/main/kotlin/nebulosa/test/Http.kt
@@ -1,5 +1,4 @@
 @file:JvmName("Http")
-@file:Suppress("NOTHING_TO_INLINE")
 
 package nebulosa.test
 

diff --git a/...c/main/kotlin/nebulosa/test/Extensions.kt → ...-test/src/main/kotlin/nebulosa/test/IO.kt b/...c/main/kotlin/nebulosa/test/Extensions.kt → ...-test/src/main/kotlin/nebulosa/test/IO.kt
diff --git a/nebulosa-test/src/main/kotlin/nebulosa/test/Matchers.kt b/nebulosa-test/src/main/kotlin/nebulosa/test/Matchers.kt
diff --git a/nebulosa-time/src/main/kotlin/nebulosa/time/SystemClock.kt b/nebulosa-time/src/main/kotlin/nebulosa/time/SystemClock.kt
@@ -1,15 +1,16 @@
 package nebulosa.time
 
 import java.time.Clock
+import java.time.Instant
 import java.time.ZoneId
 
 object SystemClock : Clock() {
 
     private val clock = systemDefaultZone()
 
-    override fun getZone() = ZoneId.systemDefault()
+    override fun getZone(): ZoneId = ZoneId.systemDefault()
 
-    override fun withZone(zone: ZoneId) = clock.withZone(zone)
+    override fun withZone(zone: ZoneId): Clock = clock.withZone(zone)
 
-    override fun instant() = clock.instant()
+    override fun instant(): Instant = clock.instant()
 }
diff --git a/nebulosa-xisf/src/main/kotlin/nebulosa/xisf/XisfHeaderInputStream.kt b/nebulosa-xisf/src/main/kotlin/nebulosa/xisf/XisfHeaderInputStream.kt
@@ -127,9 +127,9 @@ class XisfHeaderInputStream(source: InputStream) : AutoCloseable {
     }
 
     private fun parseProperty(): HeaderCard? {
-        val id = reader.attribute("id")!!
+        val id = reader.attribute("id") ?: return null
         val key = AstronomicalImageProperties[id] ?: return null
-        val propertyType = XisfPropertyType.fromTypeName(reader.attribute("type")!!) ?: return null
+        val propertyType = XisfPropertyType.fromTypeName(reader.attribute("type") ?: return null) ?: return null
         val value = reader.attribute("value") ?: reader.elementText.trim()
         return XisfHeaderCard(key.key, value, key.comment, propertyType)
     }