Merge branch 'dev' into ms/#188-consider-none-equivalent-value-for-mi…

…ssing-data-pints-in-weather

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Add safety factor sRated calculation [#629](https://github.com/ie3-institute/simona/issues/629)
+- Re-implemented ResultEventListener in akka typed [#343](https://github.com/ie3-institute/simona/issues/343)
 - Added an interpolation for missing weather data [#188](https://github.com/ie3-institute/simona/issues/188)
 
 ### Changed

build.gradle

@@ -8,7 +8,7 @@ plugins {
   id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined)
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '6.22.0'// code format
-  id "com.github.ben-manes.versions" version '0.49.0'
+  id "com.github.ben-manes.versions" version '0.50.0'
   id "de.undercouch.download" version "5.5.0" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
   id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
@@ -68,7 +68,7 @@ repositories {
 
 dependencies {
   constraints {
-    implementation( 'com.fasterxml.jackson.core:jackson-databind:2.15.3+' ){
+    implementation( 'com.fasterxml.jackson.core:jackson-databind:2.16.0+' ){
       because "[CVE-2020-25649] CWE-611: Improper Restriction of XML External Entity Reference ('XXE')"
     }
   }

src/main/scala/edu/ie3/simona/event/ResultEvent.scala

@@ -14,8 +14,9 @@ import edu.ie3.datamodel.models.result.connector.{
 }
 import edu.ie3.datamodel.models.result.system.SystemParticipantResult
 import edu.ie3.simona.agent.grid.GridResultsSupport.PartialTransformer3wResult
+import edu.ie3.simona.event.listener.ResultEventListener.ResultMessage
 
-sealed trait ResultEvent extends Event
+sealed trait ResultEvent extends ResultMessage
 
 /** Calculation result events
   */