Remove CsvDataSource workaround

CHANGELOG.md

@@ -33,6 +33,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
 

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)