Merge branch 'dev' into ms/#666-convert-GridAgent-&-DBFSAlgorithm-to-…

…pekko-typed

CHANGELOG.md

@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)
 - Removed version number "2.0" from the logo printed to console [#642](https://github.com/ie3-institute/simona/issues/642)
 - Fixed PV Model documentation [#684](https://github.com/ie3-institute/simona/issues/684), [#686](https://github.com/ie3-institute/simona/issues/686)
+- Removed `CsvDataSourceAdapter` workaround [#702](https://github.com/ie3-institute/simona/issues/702)
 
 ## [3.0.0] - 2023-08-07
 

build.gradle

@@ -7,7 +7,7 @@ plugins {
   id 'signing'
   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.24.0'// code format
+  id 'com.diffplug.spotless' version '6.25.0'// code format
   id "com.github.ben-manes.versions" version '0.51.0'
   id "de.undercouch.download" version "5.5.0" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
@@ -25,7 +25,7 @@ ext {
 
   scalaVersion = '2.13'
   scalaBinaryVersion = '2.13.12'
-  pekkoVersion = '1.0.1'
+  pekkoVersion = '1.0.2'
   jtsVersion = '1.19.0'
   confluentKafkaVersion = '7.4.0'
   tscfgVersion = '1.0.2'
@@ -107,7 +107,7 @@ dependencies {
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
   testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
-  testImplementation 'org.mockito:mockito-core:5.9.0' // mocking framework
+  testImplementation 'org.mockito:mockito-core:5.10.0' // mocking framework
   testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.17"
   testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output
   testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'

src/main/scala/edu/ie3/simona/service/weather/WeatherSource.scala

@@ -15,7 +15,7 @@ import edu.ie3.datamodel.io.factory.timeseries.{
 }
 import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.source.IdCoordinateSource
-import edu.ie3.datamodel.io.source.csv.CsvIdCoordinateSource
+import edu.ie3.datamodel.io.source.csv.{CsvDataSource, CsvIdCoordinateSource}
 import edu.ie3.datamodel.io.source.sql.SqlIdCoordinateSource
 import edu.ie3.datamodel.models.value.WeatherValue
 import edu.ie3.simona.config.SimonaConfig
@@ -39,7 +39,6 @@ import edu.ie3.simona.util.ConfigUtil.DatabaseConfigUtil.{
 import edu.ie3.simona.util.ParsableEnumeration
 import edu.ie3.util.geo.{CoordinateDistance, GeoUtils}
 import edu.ie3.util.quantities.PowerSystemUnits
-import edu.ie3.util.scala.io.CsvDataSourceAdapter
 import edu.ie3.util.scala.quantities.WattsPerSquareMeter
 import org.locationtech.jts.geom.{Coordinate, Point}
 import squants.motion.MetersPerSecond
@@ -470,7 +469,7 @@ object WeatherSource {
         () =>
           new CsvIdCoordinateSource(
             idCoordinateFactory,
-            new CsvDataSourceAdapter(
+            new CsvDataSource(
               csvSep,
               Paths.get(directoryPath),
               new FileNamingStrategy()

src/main/scala/edu/ie3/util/scala/io/GraphicDataCleaner.scala

@@ -31,7 +31,7 @@ object GraphicDataCleaner {
 
     /* setup */
     val dataSource: CsvDataSource =
-      new CsvDataSourceAdapter(csvSep, baseFolder, fileNamingStrategy)
+      new CsvDataSource(csvSep, baseFolder, fileNamingStrategy)
 
     val csvTypeSource: TypeSource =
       new TypeSource(dataSource)