Added command parameters

Author: paulorb

src/main/kotlin/ConfigurationParser.kt

@@ -1,17 +1,29 @@
+import java.io.BufferedReader
+import java.io.File
 import java.io.StringReader
 import javax.xml.bind.JAXBContext
 import javax.xml.bind.JAXBException
 import javax.xml.bind.annotation.*
 
 class ConfigurationParser {
 
+    private var fileName: String = ""
+    fun setFileName(file: String) {
+        fileName = file
+    }
     private fun load(): Device? {
         try {
             val context = JAXBContext.newInstance(Device::class.java, Set::class.java, Random::class.java, Delay::class.java, Linear::class.java, Add::class.java, Sub::class.java)
             val unmarshaller = context.createUnmarshaller()
-            val reader = StringReader(this::class.java.classLoader.getResource("configuration.xml")!!.readText())
-            val device = unmarshaller.unmarshal(reader) as Device
-            return device
+            if(fileName.isEmpty()) {
+                val reader = StringReader(this::class.java.classLoader.getResource("configuration.xml")!!.readText())
+                val device = unmarshaller.unmarshal(reader) as Device
+                return device
+            }else{
+                val bufferedReader: BufferedReader = File(fileName).bufferedReader()
+                val device = unmarshaller.unmarshal(bufferedReader) as Device
+                return device
+            }
         } catch (e: JAXBException) {
             e.printStackTrace()
         }

src/main/kotlin/Main.kt

@@ -17,25 +17,45 @@ import kotlin.system.exitProcess
     description = ["Modbus TCP Simulator"])
 class Checksum : Callable<Int> {
 
-    @Option(names = ["-f", "--file"], description = ["configuration file (JSON)"])
-    lateinit var file: File
+    @Option(names = ["-f", "--file"], description = ["custom simulation configuration file (JSON)"])
+    var file = ""
 
     @Option(names = ["-p", "--port"], description = ["server TCP port"])
     var port = "502"
 
+    @Option(names = ["-sr", "--simulation-random"], description = ["random number simulation"])
+    var simulationRandomValues = false
+
+
 
     private lateinit var plcMemory: PlcMemory
     private lateinit var plcSimulation: PlcSimulation
+    private lateinit var modbusServer: ModbusServer
 
     override fun call(): Int {
         val mainCoroutineScope = CoroutineScope(Dispatchers.Default)
         val configuration = ConfigurationParser()
-        plcMemory = PlcMemory(configuration)
-        plcSimulation = PlcSimulation(configuration, plcMemory, mainCoroutineScope)
+
+        if(simulationRandomValues && file.isNotEmpty()){
+            println("-f and -sr cannot be mixed, one of the simulations must be chosen")
+            return -1
+        }
         //val fileContents = Files.readAllBytes(file.toPath())
         //val digest = MessageDigest.getInstance(port).digest(fileContents)
         //println(("%0" + digest.size * 2 + "x").format(BigInteger(1, digest)))
-        var modbusServer = ModbusServer(plcMemory)
+        if(simulationRandomValues) {
+            modbusServer = ModbusServer(plcMemory)
+        }else {
+            if (file.isNotEmpty()) {
+                // -f file based (Custom simulation)
+                configuration.setFileName(file)
+            }
+            // if not set default, reading internal xml
+            plcMemory = PlcMemory(configuration)
+            plcSimulation = PlcSimulation(configuration, plcMemory, mainCoroutineScope)
+            modbusServer = ModbusServer(plcMemory)
+        }
+
         try {
             modbusServer.start()
             modbusServer.block()