Merge pull request #887 from ie3-institute/df/#886_timeSeriesMappingPath

Fix path at time series mapping

Author: sebastian-peter

CHANGELOG.md

@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed wrong rated power unit hint [#804](https://github.com/ie3-institute/PowerSystemDataModel/issues/804)
 - Fixed wrong hash code generation of ConnectorResult [#817](https://github.com/ie3-institute/PowerSystemDataModel/issues/817) 
+- Fixed wrong path for timeSeriesMapping [#886](https://github.com/ie3-institute/PowerSystemDataModel/issues/886)
 
 ### Changed
 - Removing deprecated classes and methods [#540](https://github.com/ie3-institute/PowerSystemDataModel/issues/540)

src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java

@@ -42,12 +42,12 @@ public class CsvFileConnector implements DataConnector {
   private final Map<UUID, BufferedCsvWriter> timeSeriesWriters = new HashMap<>();
 
   private final FileNamingStrategy fileNamingStrategy;
-  private final Path baseDirectoryName;
+  private final Path baseDirectory;
 
   private static final String FILE_ENDING = ".csv";
 
-  public CsvFileConnector(Path baseDirectoryName, FileNamingStrategy fileNamingStrategy) {
-    this.baseDirectoryName = baseDirectoryName;
+  public CsvFileConnector(Path baseDirectory, FileNamingStrategy fileNamingStrategy) {
+    this.baseDirectory = baseDirectory;
     this.fileNamingStrategy = fileNamingStrategy;
   }
 
@@ -61,7 +61,7 @@ public synchronized BufferedCsvWriter getOrInitWriter(
     /* If it is not available, build and register one */
     try {
       CsvFileDefinition fileDefinition = buildFileDefinition(clz, headerElements, csvSep);
-      BufferedCsvWriter newWriter = initWriter(baseDirectoryName, fileDefinition);
+      BufferedCsvWriter newWriter = initWriter(baseDirectory, fileDefinition);
 
       entityWriters.put(clz, newWriter);
       return newWriter;
@@ -81,7 +81,7 @@ BufferedCsvWriter getOrInitWriter(T timeSeries, String[] headerElements, String
     /* If it is not available, build and register one */
     try {
       CsvFileDefinition fileDefinition = buildFileDefinition(timeSeries, headerElements, csvSep);
-      BufferedCsvWriter newWriter = initWriter(baseDirectoryName, fileDefinition);
+      BufferedCsvWriter newWriter = initWriter(baseDirectory, fileDefinition);
 
       timeSeriesWriters.put(timeSeries.getUuid(), newWriter);
       return newWriter;
@@ -188,7 +188,7 @@ public BufferedReader initReader(Class<? extends UniqueEntity> clz)
    * @throws FileNotFoundException if no file with the provided file name can be found
    */
   public BufferedReader initReader(Path filePath) throws FileNotFoundException {
-    File fullPath = baseDirectoryName.resolve(filePath.toString() + FILE_ENDING).toFile();
+    File fullPath = baseDirectory.resolve(filePath.toString() + FILE_ENDING).toFile();
     return new BufferedReader(
         new InputStreamReader(new FileInputStream(fullPath), StandardCharsets.UTF_8), 16384);
   }
@@ -228,10 +228,9 @@ public BufferedReader initReader(Path filePath) throws FileNotFoundException {
    * @return A set of relative paths to time series files, with respect to the base folder path
    */
   private Set<Path> getIndividualTimeSeriesFilePaths() {
-    Path baseDirectoryPath = baseDirectoryName.resolve(baseDirectoryName);
-    try (Stream<Path> pathStream = Files.walk(baseDirectoryPath)) {
+    try (Stream<Path> pathStream = Files.walk(baseDirectory)) {
       return pathStream
-          .map(baseDirectoryPath::relativize)
+          .map(baseDirectory::relativize)
           .filter(
               path -> {
                 Path withoutEnding =

src/test/groovy/edu/ie3/datamodel/io/csv/BufferedCsvWriterTest.groovy

@@ -23,9 +23,12 @@ class BufferedCsvWriterTest extends Specification {
   }
 
   def cleanupSpec() {
-    FileIOUtils.deleteRecursively(tmpDirectory)
+    try {
+      FileIOUtils.deleteRecursively(tmpDirectory)
+    } catch (IOException e) {
+      throw new FileException("Unable to delete recursively.", e)
+    }
   }
-
   def "The convenience constructor of the BufferedCsvWriter class works as expected."() {
     given:
     def baseDirectory = tmpDirectory

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy

@@ -68,7 +68,7 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta {
   def "A DataSource should contain a valid connector after initialization"() {
     expect:
     dummyCsvSource.connector != null
-    dummyCsvSource.connector.baseDirectoryName == testBaseFolderPath
+    dummyCsvSource.connector.baseDirectory == testBaseFolderPath
     dummyCsvSource.connector.fileNamingStrategy == fileNamingStrategy
     dummyCsvSource.connector.entityWriters.isEmpty()
   }