final fixes

Author: PhilippSchmelter

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

@@ -40,8 +40,8 @@ public CsvFileConnector(Path baseDirectory) {
     super(baseDirectory);
   }
 
-  public CsvFileConnector(Path baseDirectory, Function<String, InputStream> inputStreamBuilder) {
-    super(baseDirectory, inputStreamBuilder);
+  public CsvFileConnector(Path baseDirectory, Function<String, InputStream> customInputStream) {
+    super(baseDirectory, customInputStream);
   }
 
   public synchronized BufferedCsvWriter getOrInitWriter(

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

@@ -16,7 +16,9 @@ public abstract class FileConnector implements DataConnector {
 
   protected final Path baseDirectory;
 
-  /** Optional factory for custom input streams; may be {@code null} to use the default handling. */
+  /**
+   * Optional factory for custom input streams; may be {@code null} when using the default handling.
+   */
   private final Function<String, InputStream> customInputStream;
 
   protected FileConnector(Path baseDirectory) {

src/main/java/edu/ie3/datamodel/io/source/file/FileDataSource.java

@@ -70,19 +70,18 @@ protected Set<Path> getTimeSeriesFilePaths(Pattern pattern) {
 
   public Stream<FileIndividualTimeSeriesMetaInformation> getIndividualTimeSeriesMetaInformation(
       final ColumnScheme... columnSchemes) {
-    FileNamingStrategy namingStrategy = getNamingStrategy();
-    return getTimeSeriesFilePaths(namingStrategy.getIndividualTimeSeriesPattern()).parallelStream()
+    return getTimeSeriesFilePaths(fileNamingStrategy.getIndividualTimeSeriesPattern())
+        .parallelStream()
         .map(filePath -> resolveFileInformation(filePath, "individual time series"))
         .flatMap(Optional::stream)
         .map(
             fileMeta -> {
               IndividualTimeSeriesMetaInformation metaInformation =
-                  namingStrategy.individualTimeSeriesMetaInformation(
+                  fileNamingStrategy.individualTimeSeriesMetaInformation(
                       fileMeta.filePath().toString());
               return new FileIndividualTimeSeriesMetaInformation(
                   metaInformation, fileMeta.pathWithoutEnding(), fileMeta.fileType());
             })
-        .filter(meta -> meta.getFileType() != null)
         .filter(
             metaInformation ->
                 columnSchemes == null
@@ -99,20 +98,18 @@ public Stream<FileIndividualTimeSeriesMetaInformation> getIndividualTimeSeriesMe
    */
   public Stream<FileLoadProfileMetaInformation> getLoadProfileMetaInformation(
       LoadProfile... profiles) {
-    FileNamingStrategy namingStrategy = getNamingStrategy();
-
-    return getTimeSeriesFilePaths(namingStrategy.getLoadProfileTimeSeriesPattern()).parallelStream()
+    return getTimeSeriesFilePaths(fileNamingStrategy.getLoadProfileTimeSeriesPattern())
+        .parallelStream()
         .map(filePath -> resolveFileInformation(filePath, "load profile"))
         .flatMap(Optional::stream)
         .map(
             fileMeta -> {
               LoadProfileMetaInformation metaInformation =
-                  namingStrategy.loadProfileTimeSeriesMetaInformation(
+                  fileNamingStrategy.loadProfileTimeSeriesMetaInformation(
                       fileMeta.filePath().toString());
               return new FileLoadProfileMetaInformation(
                   metaInformation.getProfile(), fileMeta.pathWithoutEnding(), fileMeta.fileType());
             })
-        .filter(meta -> meta.getFileType() != null)
         .filter(
             metaInformation ->
                 profiles == null

src/test/groovy/edu/ie3/datamodel/io/source/csv/FileTimeSeriesMetaInformationSourceIT.groovy renamed to src/test/groovy/edu/ie3/datamodel/io/source/file/FileTimeSeriesMetaInformationSourceIT.groovy

@@ -10,7 +10,6 @@ import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.io.naming.timeseries.FileIndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.source.csv.CsvTestDataMeta
-import edu.ie3.datamodel.io.source.file.FileTimeSeriesMetaInformationSource
 import spock.lang.Shared
 import spock.lang.Specification