Implementing requested changes.

Author: staudtMarius

src/main/java/edu/ie3/datamodel/io/IoUtil.java

@@ -33,16 +33,11 @@ public static String harmonizeFileSeparator(String in) {
    * Ensure to have harmonized file separator across the whole path. Will replace all occurrences *
    * of "\" and "/" by the systems file separator.
    *
-   * @param path an option for a path to harmonize
-   * @return the option for a harmonized path
+   * @param path the path to harmonize
+   * @return the harmonized path
    */
   public static Path harmonizeFileSeparator(Path path) {
-    String in = path.toString();
-    in =
-        IoUtil.FILE_SEPARATOR_REPLACEMENT.equals("\\\\")
-            ? in.replaceFirst("^" + IoUtil.FILE_SEPARATOR_REGEX, "")
-            : in;
-    return Path.of(IoUtil.harmonizeFileSeparator(in));
+    return Path.of(IoUtil.harmonizeFileSeparator(path.toString()));
   }
 
   /**

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

@@ -184,7 +184,7 @@ public BufferedReader initReader(Class<? extends UniqueEntity> clz)
           "Cannot get reader for entity '{}' as no file naming strategy for this file exists. Exception: {}",
           clz.getSimpleName(),
           e);
-      throw new ConnectorException("Cannot init reader due to the following exception: ", e);
+      throw e;
     }
   }
 

src/main/java/edu/ie3/datamodel/utils/FileUtils.java

@@ -16,6 +16,15 @@
 
 /** Some utility functionalities. */
 public class FileUtils {
+  public static Pattern FILE_NAME_PATTERN =
+      Pattern.compile(
+          "^(?<fileName>[^\\\\/\\s.]{0,255})(?:\\.(?<extension>[a-zA-Z0-9]{0,10}(?:\\.[a-zA-Z0-9]{0,10})?))?$");
+  public static String CSV_FILE_EXTENSION = "csv";
+
+  private FileUtils() {
+    throw new IllegalStateException("Utility classes cannot be instantiated");
+  }
+
   private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
 
   /**
@@ -56,11 +65,6 @@ public static Optional<Path> of(Optional<String> fileName, Optional<Path> direct
    * @return a definition of the file
    */
   public static Path ofCsv(String fileName, Path directoryPath) {
-    Pattern FILE_NAME_PATTERN =
-        Pattern.compile(
-            "^(?<fileName>[^\\\\/\\s.]{0,255})(?:\\.(?<extension>[a-zA-Z0-9]{0,10}(?:\\.[a-zA-Z0-9]{0,10})?))?$");
-    String FILE_EXTENSION = "csv";
-
     /* Remove all file separators at the beginning and end of a directory path and ensure harmonized file separator */
     Path dirPath =
         Objects.nonNull(directoryPath) ? IoUtil.harmonizeFileSeparator(directoryPath) : Path.of("");
@@ -70,12 +74,12 @@ public static Path ofCsv(String fileName, Path directoryPath) {
 
     if (matcher.matches()) {
       String extension = matcher.group("extension");
-      if (Objects.nonNull(extension) && !extension.equalsIgnoreCase(FILE_EXTENSION))
+      if (Objects.nonNull(extension) && !extension.equalsIgnoreCase(CSV_FILE_EXTENSION))
         logger.warn(
             "You provided a file name with extension '{}'. It will be overridden to '{}'.",
             extension,
-            FILE_EXTENSION);
-      return dirPath.resolve(matcher.group("fileName") + "." + FILE_EXTENSION);
+            CSV_FILE_EXTENSION);
+      return dirPath.resolve(matcher.group("fileName") + "." + CSV_FILE_EXTENSION);
     } else {
       throw new IllegalArgumentException(
           "The file name '"

src/test/groovy/edu/ie3/datamodel/io/naming/FileNamingStrategyTest.groovy

@@ -982,4 +982,15 @@ class FileNamingStrategyTest extends Specification {
     idFilePath.present
     idFilePath.get() == Path.of("prefix_coordinates_suffix")
   }
+
+  def "The FileNamingStrategy with DefaultHierarchy returns the Id Coordinate file path correctly"() {
+    def fns = new FileNamingStrategy(new EntityPersistenceNamingStrategy("prefix", "suffix"), defaultHierarchy)
+
+    when:
+    def idFilePath = fns.getIdCoordinateFilePath()
+
+    then:
+    idFilePath.present
+    idFilePath.get() == defaultHierarchy.baseDirectory.get().resolve("prefix_coordinates_suffix")
+  }
 }

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

@@ -29,8 +29,8 @@ class CsvRawGridSourceTest extends Specification implements CsvTestDataMeta {
   RawGridSource source
 
   def setupSpec() {
-    TypeSource typeSource = new TypeSource(new CsvDataSource(csvSep, typeFolderPath as Path, fileNamingStrategy))
-    source = new RawGridSource(typeSource, new CsvDataSource(csvSep, gridDefaultFolderPath as Path, fileNamingStrategy))
+    TypeSource typeSource = new TypeSource(new CsvDataSource(csvSep, typeFolderPath, fileNamingStrategy))
+    source = new RawGridSource(typeSource, new CsvDataSource(csvSep, gridDefaultFolderPath, fileNamingStrategy))
   }
 
   def "The CsvRawGridSource is able to convert single valid AssetInputEntityData to ConnectorInputEntityData"() {