Merge pull request #37 from ie3-institute/sp/#36-tscfg-serialization

Make BaseRuntimeConfig serializable
ie3-institute · Jan 3, 2022 · 61605df · 61605df
2 parents 1677448 + e6f7e9d
commit 61605df
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 35 deletions.
diff --git a/src/main/resources/config/config-template.conf b/src/main/resources/config/config-template.conf
@@ -14,7 +14,7 @@ RefSystemConfig {
   gridIds: [string]           # Sub grid numbers to apply to, expl.: 1,2,4..10
 }
 
-#@define abstract
+#@define abstract extends !java.io.Serializable
 BaseRuntimeConfig {
   uuids: [string]          # Unique id to identify the system participant models this config applies for
   scaling: double          # General scaling factor of the system participant model

diff --git a/src/main/scala/edu/ie3/simona/config/SimonaConfig.scala b/src/main/scala/edu/ie3/simona/config/SimonaConfig.scala
@@ -67,7 +67,7 @@ object SimonaConfig {
       val calculateMissingReactivePowerWithModel: scala.Boolean,
       val scaling: scala.Double,
       val uuids: scala.List[java.lang.String]
-  )
+  ) extends java.io.Serializable
 
   final case class EvcsRuntimeConfig(
       override val calculateMissingReactivePowerWithModel: scala.Boolean,
@@ -208,12 +208,10 @@ object SimonaConfig {
         nodes = c.hasPathOrNull("nodes") && c.getBoolean("nodes"),
         notifier = $_reqStr(parentPath, c, "notifier", $tsCfgValidator),
         switches = c.hasPathOrNull("switches") && c.getBoolean("switches"),
-        transformers2w = c.hasPathOrNull("transformers2w") && c.getBoolean(
-          "transformers2w"
-        ),
-        transformers3w = c.hasPathOrNull("transformers3w") && c.getBoolean(
-          "transformers3w"
-        )
+        transformers2w =
+          c.hasPathOrNull("transformers2w") && c.getBoolean("transformers2w"),
+        transformers3w =
+          c.hasPathOrNull("transformers3w") && c.getBoolean("transformers3w")
       )
     }
     private def $_reqStr(
@@ -974,12 +972,11 @@ object SimonaConfig {
             csvParams =
               if (c.hasPathOrNull("csvParams"))
                 scala.Some(
-                  SimonaConfig.Simona.Input.Primary
-                    .CsvParams(
-                      c.getConfig("csvParams"),
-                      parentPath + "csvParams.",
-                      $tsCfgValidator
-                    )
+                  SimonaConfig.Simona.Input.Primary.CsvParams(
+                    c.getConfig("csvParams"),
+                    parentPath + "csvParams.",
+                    $tsCfgValidator
+                  )
                 )
               else None,
             influxDb1xParams =
@@ -995,12 +992,11 @@ object SimonaConfig {
             sqlParams =
               if (c.hasPathOrNull("sqlParams"))
                 scala.Some(
-                  SimonaConfig.Simona.Input.Primary
-                    .SqlParams(
-                      c.getConfig("sqlParams"),
-                      parentPath + "sqlParams.",
-                      $tsCfgValidator
-                    )
+                  SimonaConfig.Simona.Input.Primary.SqlParams(
+                    c.getConfig("sqlParams"),
+                    parentPath + "sqlParams.",
+                    $tsCfgValidator
+                  )
                 )
               else None
           )
@@ -1371,7 +1367,8 @@ object SimonaConfig {
                   )
                 else None,
               resolution =
-                if (c.hasPathOrNull("resolution")) Some(c.getLong("resolution"))
+                if (c.hasPathOrNull("resolution"))
+                  Some(c.getLong("resolution").longValue())
                 else None,
               sampleParams =
                 if (c.hasPathOrNull("sampleParams"))
@@ -1469,9 +1466,7 @@ object SimonaConfig {
           SimonaConfig.Simona.Output.Base(
             addTimestampToOutputDir = !c.hasPathOrNull(
               "addTimestampToOutputDir"
-            ) || c.getBoolean(
-              "addTimestampToOutputDir"
-            ),
+            ) || c.getBoolean("addTimestampToOutputDir"),
             dir = $_reqStr(parentPath, c, "dir", $tsCfgValidator)
           )
         }
@@ -1627,12 +1622,11 @@ object SimonaConfig {
             csv =
               if (c.hasPathOrNull("csv"))
                 scala.Some(
-                  SimonaConfig.Simona.Output.Sink
-                    .Csv(
-                      c.getConfig("csv"),
-                      parentPath + "csv.",
-                      $tsCfgValidator
-                    )
+                  SimonaConfig.Simona.Output.Sink.Csv(
+                    c.getConfig("csv"),
+                    parentPath + "csv.",
+                    $tsCfgValidator
+                  )
                 )
               else None,
             influxDb1x =
@@ -1686,8 +1680,8 @@ object SimonaConfig {
     final case class Powerflow(
         maxSweepPowerDeviation: scala.Double,
         newtonraphson: SimonaConfig.Simona.Powerflow.Newtonraphson,
-        sweepTimeout: java.time.Duration,
-        resolution: java.time.Duration
+        resolution: java.time.Duration,
+        sweepTimeout: java.time.Duration
     )
     object Powerflow {
       final case class Newtonraphson(
@@ -2276,7 +2270,7 @@ object SimonaConfig {
     java.lang.String.valueOf(cv.unwrapped())
   }
 
-  private final class $TsCfgValidator {
+  final class $TsCfgValidator {
     private val badPaths =
       scala.collection.mutable.ArrayBuffer[java.lang.String]()
 

diff --git a/src/test/scala/edu/ie3/simona/config/ConfigFailFastSpec.scala b/src/test/scala/edu/ie3/simona/config/ConfigFailFastSpec.scala
@@ -85,8 +85,8 @@ class ConfigFailFastSpec extends UnitSpec with ConfigTestData {
                   List(10, 30),
                   100
                 ),
-                Duration.of(3600, ChronoUnit.SECONDS),
-                Duration.of(3600, ChronoUnit.NANOS)
+                resolution = Duration.of(3600, ChronoUnit.NANOS),
+                sweepTimeout = Duration.of(3600, ChronoUnit.SECONDS)
               )
             )
           }.getMessage shouldBe "Invalid time resolution. Please ensure, that the time resolution for power flow calculation is at least rounded to a full second!"