Introduce actor based concurrent conversion

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Actor-based implementation for better concurrency
 
 ## [1.0.0] - 2021-08-03
 ### Added

build.gradle

@@ -18,7 +18,7 @@ ext {
 
 	scalaVersion = '2.13'
 	scalaBinaryVersion = '2.13.6'
-	tscfgVersion = '0.9.986'
+	tscfgVersion = '0.9.993'
 	slf4jVersion = '1.7.32'
 
 	scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
@@ -64,11 +64,11 @@ dependencies {
 	implementation 'tech.units:indriya:2.1.2'
 
 	// logging
-	implementation 'org.apache.logging.log4j:log4j-api:+' // log4j
-	implementation 'org.apache.logging.log4j:log4j-core:+' // log4j
-	implementation 'org.apache.logging.log4j:log4j-slf4j-impl:+' // log4j -> slf4j
+	implementation 'org.apache.logging.log4j:log4j-api:2.14.1' // log4j
+	implementation 'org.apache.logging.log4j:log4j-core:2.14.1' // log4j
+	implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1' // log4j -> slf4j
 
-	implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:+" // akka scala logging
+	implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.4" // akka scala logging
 	implementation "org.slf4j:log4j-over-slf4j:${slf4jVersion}" // slf4j -> log4j
 
 	// NEW scala libs //
@@ -82,21 +82,31 @@ dependencies {
 	testImplementation "org.pegdown:pegdown:1.6.0" // HTML report for scalatest
 	implementation 'org.mockito:mockito-core:3.11.2' // mocking framework
 
+	// akka actor system //
+	implementation platform("com.typesafe.akka:akka-bom_${scalaVersion}:2.6.14")
+	implementation "com.typesafe.akka:akka-actor-typed_${scalaVersion}"
+	implementation "com.typesafe.akka:akka-stream_${scalaVersion}"
+	testImplementation "com.typesafe.akka:akka-actor-testkit-typed_${scalaVersion}"
+
 	// config //
-	implementation 'com.typesafe:config:+'
+	implementation 'com.typesafe:config:1.4.1'
 	implementation "com.github.carueda:tscfg_2.13:${tscfgVersion}"
 
 	// cmd args parser //
 	implementation "com.github.scopt:scopt_${scalaVersion}:+"
 
 	/* Handling compressed archives */
-	implementation "org.apache.commons:commons-compress:+"
+	implementation "org.apache.commons:commons-compress:1.21"
 }
 
 wrapper {
-	gradleVersion = '7.1.1'
+	gradleVersion = '7.2'
 }
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }
+
+tasks.withType(Javadoc){
+	options.encoding = 'UTF-8'
+}

docs/diagrams/protocol/protocol.puml

@@ -0,0 +1,56 @@
+@startuml
+
+participant Main
+participant Coordinator
+participant Converter
+participant GridConverter
+participant ResConverter
+collections ResConverterWorker
+participant Mutator
+
+Main -> Coordinator: Start(Config)
+== Init ==
+Coordinator --[#blue]> Converter: <font color=blue>spawn & watch</font>
+Coordinator -> Converter: Init(...)
+Converter --[#blue]> Mutator: <font color=blue>spawn & watch</font>
+Converter -> Mutator: Init(Config)
+Converter <- Mutator: Ready
+Coordinator <- Converter: ConverterInitialized
+Coordinator -> Converter: Convert(String)
+
+== Converting grid structure ==
+Converter --[#blue]> GridConverter: <font color=blue>spawn & watch</font>
+Converter -> GridConverter: ConvertGridStructure(...)
+Converter <- GridConverter: GridStructureConverted(...)
+note left: Now all other entities\ncan be converted (not)\nconsidering islanded\nnodes
+
+== Converting participants ==
+Converter --[#blue]> ResConverter: <font color=blue>spawn & watch</font>
+Converter -> ResConverter: Init(...)
+ResConverter --[#blue]> ResConverterWorker:  <font color=blue>spawn & watch</font>
+Converter <- ResConverter: ResConverterReady
+Converter -> ResConverter: Convert(...)
+ResConverter -> ResConverterWorker: Convert(...)
+ResConverterWorker -> Mutator: PersistTimeSeries(...)
+activate Mutator
+ResConverterWorker <- Mutator: TimeSeriesPersisted(...)
+ResConverter <- ResConverterWorker: Converted(...)
+ResConverter --[#blue]> ResConverterWorker: <font color=blue>terminate</font>
+ResConverter <--[#blue] ResConverterWorker
+Converter <- ResConverter: ResConverted(...)
+
+== Mutate Grid structure ==
+Converter -> Mutator: PersistGridStructure(...)
+Converter -> Mutator: PersistTimeSeriesMapping(...)
+Converter -> Mutator: PersistNodalResults(...)
+Converter <- Mutator: GridStructurePersisted(...)
+Converter <- Mutator: TimeSeriesMappingPersisted(...)
+Converter <- Mutator: NodalResultsPersisted(...)
+
+== Shutdown ==
+Converter -> Mutator: Shutdown
+Converter <- Mutator: Done
+deactivate Mutator
+
+Coordinator <- Converter: Converted(String)
+@enduml

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/resources/config-template.conf

@@ -22,4 +22,5 @@ io {
 }
 conversion {
   removeSwitches = "Boolean" | false
+  participantWorkersPerType = "Int" | 20
 }