Refactor: Move all form item handlers into its own package

src/main/ApiUtil.kt

@@ -1,8 +1,6 @@
 package com.github.statnett.loadflowservice
 
 import com.powsybl.iidm.network.Network
-import com.powsybl.loadflow.LoadFlowParameters
-import com.powsybl.loadflow.json.JsonLoadFlowParameters
 import com.powsybl.nad.NetworkAreaDiagram
 import com.powsybl.sld.SingleLineDiagram
 import com.powsybl.sld.SldParameters
@@ -19,36 +17,6 @@ fun busesFromRequest(
     return busPropertiesFromNetwork(network)
 }
 
-interface FormItemLoadable {
-    fun formItemHandler(part: PartData.FormItem)
-}
-
-/**
- * Convenience class used to deserialize and update a load parameter instance
- */
-class LoadParameterContainer : AutoVersionableJsonParser(), FormItemLoadable {
-    var parameters = LoadFlowParameters()
-    private var parametersModified = false
-
-    override fun currentVersion(): String {
-        return LoadFlowParameters.VERSION
-    }
-
-    private fun update(jsonString: String) {
-        val withVersion = jsonStringWithVersion(jsonString)
-        this.parameters = JsonLoadFlowParameters.update(this.parameters, withVersion.byteInputStream())
-        this.parametersModified = true
-    }
-
-    override fun formItemHandler(part: PartData.FormItem) {
-        val name = part.name ?: ""
-        if (name == "load-flow-parameters") {
-            this.update(part.value)
-            logger.info { "Received load flow parameters: ${part.value}" }
-        }
-    }
-}
-
 suspend fun multiPartDataHandler(
     multiPartData: MultiPartData,
     formItemHandler: (part: PartData.FormItem) -> Unit = {}

src/main/App.kt

@@ -1,5 +1,6 @@
 package com.github.statnett.loadflowservice
 
+import com.github.statnett.loadflowservice.formItemHandlers.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*

src/main/AutoVersionableJsonParser.kt → src/main/formItemHandlers/AutoVersionableJsonParser.kt

@@ -1,4 +1,4 @@
-package com.github.statnett.loadflowservice
+package com.github.statnett.loadflowservice.formItemHandlers
 
 import io.ktor.http.content.*
 

src/main/ContingencyListContainer.kt → src/main/formItemHandlers/ContingencyListContainer.kt

@@ -1,4 +1,4 @@
-package com.github.statnett.loadflowservice
+package com.github.statnett.loadflowservice.formItemHandlers
 
 import com.powsybl.contingency.contingency.list.ContingencyList
 import com.powsybl.contingency.contingency.list.DefaultContingencyList

src/main/formItemHandlers/FormItemLoadable.kt

@@ -0,0 +1,7 @@
+package com.github.statnett.loadflowservice.formItemHandlers
+
+import io.ktor.http.content.*
+
+interface FormItemLoadable {
+    fun formItemHandler(part: PartData.FormItem)
+}

src/main/formItemHandlers/LoadParameterContainer.kt

@@ -0,0 +1,34 @@
+package com.github.statnett.loadflowservice.formItemHandlers
+
+import com.powsybl.loadflow.LoadFlowParameters
+import com.powsybl.loadflow.json.JsonLoadFlowParameters
+import io.github.oshai.kotlinlogging.KotlinLogging
+import io.ktor.http.content.*
+
+private val logger = KotlinLogging.logger {}
+
+/**
+ * Convenience class used to deserialize and update a load parameter instance
+ */
+class LoadParameterContainer : AutoVersionableJsonParser(), FormItemLoadable {
+    var parameters = LoadFlowParameters()
+    private var parametersModified = false
+
+    override fun currentVersion(): String {
+        return LoadFlowParameters.VERSION
+    }
+
+    private fun update(jsonString: String) {
+        val withVersion = jsonStringWithVersion(jsonString)
+        this.parameters = JsonLoadFlowParameters.update(this.parameters, withVersion.byteInputStream())
+        this.parametersModified = true
+    }
+
+    override fun formItemHandler(part: PartData.FormItem) {
+        val name = part.name ?: ""
+        if (name == "load-flow-parameters") {
+            this.update(part.value)
+            logger.info { "Received load flow parameters: ${part.value}" }
+        }
+    }
+}

src/main/MultiFormItemLoaders.kt → src/main/formItemHandlers/MultiFormItemLoaders.kt

@@ -1,4 +1,4 @@
-package com.github.statnett.loadflowservice
+package com.github.statnett.loadflowservice.formItemHandlers
 
 import io.ktor.http.content.*
 

src/main/SensitivityAnalysisParametersContainer.kt → src/main/formItemHandlers/SensitivityAnalysisParametersContainer.kt

@@ -1,5 +1,4 @@
-package com.github.statnett.loadflowservice
-
+package com.github.statnett.loadflowservice.formItemHandlers
 
 import com.powsybl.sensitivity.SensitivityAnalysisParameters
 import com.powsybl.sensitivity.json.JsonSensitivityAnalysisParameters

src/main/SensitivityFactorContainer.kt → src/main/formItemHandlers/SensitivityFactorContainer.kt

@@ -1,4 +1,4 @@
-package com.github.statnett.loadflowservice
+package com.github.statnett.loadflowservice.formItemHandlers
 
 import com.powsybl.contingency.ContingencyContext
 import com.powsybl.contingency.ContingencyContextType

src/test/ContingencyListContainerTest.kt

@@ -1,4 +1,4 @@
-import com.github.statnett.loadflowservice.ContingencyListContainer
+import com.github.statnett.loadflowservice.formItemHandlers.ContingencyListContainer
 import com.powsybl.ieeecdf.converter.IeeeCdfNetworkFactory
 import testDataFactory.basicContingencyJson
 import kotlin.test.Test

src/test/SensitivityAnalysisParametersContainerTest.kt

@@ -1,4 +1,4 @@
-import com.github.statnett.loadflowservice.SensitivityAnalysisParametersContainer
+import com.github.statnett.loadflowservice.formItemHandlers.SensitivityAnalysisParametersContainer
 import kotlin.math.abs
 import kotlin.test.Test
 import kotlin.test.assertTrue

src/test/SensitivityFactorContainerTest.kt

@@ -1,4 +1,4 @@
-import com.github.statnett.loadflowservice.SensitivityFactorContainer
+import com.github.statnett.loadflowservice.formItemHandlers.SensitivityFactorContainer
 import testDataFactory.sensitivityFactorList
 import kotlin.test.Test
 import kotlin.test.assertEquals

src/test/testDataFactory/SensitivityRunFactory.kt

@@ -1,6 +1,6 @@
 package testDataFactory
 
-import com.github.statnett.loadflowservice.AutoSerializableSensitivityFactor
+import com.github.statnett.loadflowservice.formItemHandlers.AutoSerializableSensitivityFactor
 import io.ktor.client.request.forms.*
 import io.ktor.http.content.*
 import kotlinx.serialization.Serializable