Skip to content

Commit 4a8208e

Browse files
resolve convos
1 parent 284ba1c commit 4a8208e

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525
- Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
2626
- Change `TimeSeries` to no longer extend `UniqueEntity` [#1441](https://github.com/ie3-institute/PowerSystemDataModel/issues/1441)
2727
- Refactor CSV handling into shared file-based infrastructure. [#1450](https://github.com/ie3-institute/PowerSystemDataModel/issues/1445)
28+
2829
## [8.1.0] - 2025-07-25
2930

3031
### Added

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
public abstract class FileConnector implements DataConnector {
1616

1717
protected final Path baseDirectory;
18-
private final Function<String, InputStream> inputStreamBuilder;
18+
19+
/** Optional factory for custom input streams; may be {@code null} to use the default handling. */
20+
private final Function<String, InputStream> customInputStream;
1921

2022
protected FileConnector(Path baseDirectory) {
2123
this(baseDirectory, null);
2224
}
2325

24-
protected FileConnector(Path baseDirectory, Function<String, InputStream> inputStreamBuilder) {
26+
protected FileConnector(Path baseDirectory, Function<String, InputStream> customInputStream) {
2527
this.baseDirectory = baseDirectory;
26-
this.inputStreamBuilder = inputStreamBuilder;
28+
this.customInputStream = customInputStream;
2729
}
2830

2931
/** Returns the base directory backing this connector. */
@@ -37,8 +39,8 @@ public Path getBaseDirectory() {
3739
*/
3840
protected InputStream openInputStream(Path filePath) throws FileNotFoundException {
3941
Path fullPath = resolveFilePath(filePath);
40-
if (inputStreamBuilder != null) {
41-
return inputStreamBuilder.apply(fullPath.toString());
42+
if (customInputStream != null) {
43+
return customInputStream.apply(fullPath.toString());
4244
}
4345
return new FileInputStream(fullPath.toFile());
4446
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
* Institute of Energy Systems, Energy Efficiency and Energy Economics,
44
* Research group Distribution grid planning and operation
55
*/
6-
package edu.ie3.datamodel.io.source.csv
6+
package edu.ie3.datamodel.io.source.file
77

88
import edu.ie3.datamodel.io.file.FileType
99
import edu.ie3.datamodel.io.naming.FileNamingStrategy
1010
import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
1111
import edu.ie3.datamodel.io.naming.timeseries.FileIndividualTimeSeriesMetaInformation
12+
import edu.ie3.datamodel.io.source.csv.CsvTestDataMeta
1213
import edu.ie3.datamodel.io.source.file.FileTimeSeriesMetaInformationSource
1314
import spock.lang.Shared
1415
import spock.lang.Specification
@@ -54,6 +55,7 @@ class FileTimeSeriesMetaInformationSourceIT extends Specification implements Csv
5455

5556
then:
5657
result.present
58+
result.get().fileType == FileType.CSV
5759
result.get().columnScheme.scheme == columnScheme
5860

5961
where:

0 commit comments

Comments
 (0)