WIP: Fix rawx import

src/main/ApiUtil.kt

@@ -9,6 +9,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.content.*
 import java.io.ByteArrayInputStream
 import java.io.StringWriter
+import java.security.MessageDigest
 
 private val logger = KotlinLogging.logger {}
 
@@ -20,7 +21,16 @@ fun busesFromRequest(
     return busPropertiesFromNetwork(network)
 }
 
-class FileContent(val name: String, val bytes: ByteArray)
+class FileContent(val name: String, val bytes: ByteArray) {
+    fun contentHash(): String {
+        val md = MessageDigest.getInstance("MD5")
+        return md.digest(this.bytes).joinToString(separator = "") { eachByte -> "%02x".format(eachByte) }
+    }
+
+    fun contentAsStream(): ByteArrayInputStream {
+        return ByteArrayInputStream(this.bytes)
+    }
+}
 
 /**
  * Convenience class used to deserialize and update a load parameter instance
@@ -68,9 +78,11 @@ suspend fun multiPartDataHandler(
             }
 
             is PartData.FileItem -> {
-                val name = part.originalFileName as String
+                val name = part.originalFileName ?: ""
                 val content = part.streamProvider().readBytes()
-                files.add(FileContent(name, content))
+                val fileContent = FileContent(name, content)
+                logger.info { "Received file $name with size ${content.size} bytes. Content hash: ${fileContent.contentHash()}" }
+                files.add(fileContent)
             }
 
             else -> {}

src/main/App.kt

@@ -26,7 +26,10 @@ fun Application.module() {
 
     install(StatusPages) {
         exception<Throwable> { call, cause ->
-            call.respondText("500: $cause", status = HttpStatusCode.InternalServerError)
+            call.respondText(
+                "500: $cause.\nStack trace: ${cause.stackTraceToString()}",
+                status = HttpStatusCode.InternalServerError
+            )
         }
     }
 

src/main/Solver.kt

@@ -1,35 +1,38 @@
 package com.github.statnett.loadflowservice
 
-import com.powsybl.cgmes.conversion.CgmesImport
-import com.powsybl.ieeecdf.converter.IeeeCdfImporter
-import com.powsybl.iidm.network.ImportersLoaderList
-import com.powsybl.iidm.network.Network
-import com.powsybl.iidm.xml.XMLImporter
+import com.powsybl.iidm.network.*
 import com.powsybl.loadflow.LoadFlow
 import com.powsybl.loadflow.LoadFlowParameters
 import com.powsybl.loadflow.json.JsonLoadFlowParameters
-import com.powsybl.matpower.converter.MatpowerImporter
-import com.powsybl.powerfactory.converter.PowerFactoryImporter
-import com.powsybl.psse.converter.PsseImporter
-import com.powsybl.ucte.converter.UcteImporter
-import java.io.ByteArrayInputStream
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
+private val logger = KotlinLogging.logger {}
+
 fun networkFromStream(
     filename: String,
     content: InputStream,
 ): Network {
-    val importerLoader = ImportersLoaderList(
-        PsseImporter(), XMLImporter(), CgmesImport(),
-        IeeeCdfImporter(), UcteImporter(),
-        MatpowerImporter(), PowerFactoryImporter()
-    )
+    warnOnFewAvailableImporters()
     return Network.read(filename, content)
 }
 
+fun warnOnFewAvailableImporters() {
+    val numLoaders = ImportersServiceLoader().loadImporters().size
+    val expect = 7
+
+    // TODO: Currently this happens when the executable jar is run with the java command
+    // does not happen when run via mvn exec:java.
+    // Too few loaders will most likely result errors when trying load many file formats
+    if (numLoaders < expect) {
+        logger.warn { "Few available loadImporters ($numLoaders)" }
+    }
+}
+
 fun networkFromFileContent(content: FileContent): Network {
-    return networkFromStream(content.name, ByteArrayInputStream(content.bytes))
+    logger.info { "Loading network from file ${content.name}" }
+    return networkFromStream(content.name, content.contentAsStream())
 }
 
 fun defaultLoadFlowParameters(): String {