Skip to content

Commit 0477ad7

Browse files
Addressing reviewer's comments
1 parent 6898605 commit 0477ad7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased/Snapshot]
88

99
### Added
10-
- SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`)
10+
- SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`) [#467](https://github.com/ie3-institute/PowerSystemDataModel/issues/467)
1111

1212
### Fixed
1313
- Reduced code smells [#492](https://github.com/ie3-institute/PowerSystemDataModel/issues/492)

src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public FileNamingStrategy() {
7373
public Optional<String> getFilePath(Class<? extends UniqueEntity> cls) {
7474
// do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
7575
// details
76-
return getFilePath(getEntityName(cls).orElse(""), getDirectoryPath(cls).orElse(""));
76+
return getFilePath(
77+
getEntityName(cls).orElseGet(() -> ""), getDirectoryPath(cls).orElseGet(() -> ""));
7778
}
7879

7980
/**
@@ -91,8 +92,8 @@ Optional<String> getFilePath(T timeSeries) {
9192
// do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
9293
// details
9394
return getFilePath(
94-
entityPersistenceNamingStrategy.getEntityName(timeSeries).orElse(""),
95-
getDirectoryPath(timeSeries).orElse(""));
95+
entityPersistenceNamingStrategy.getEntityName(timeSeries).orElseGet(() -> ""),
96+
getDirectoryPath(timeSeries).orElseGet(() -> ""));
9697
}
9798

9899
/**
@@ -167,7 +168,8 @@ Optional<String> getDirectoryPath(T timeSeries) {
167168
* @return An individual time series pattern
168169
*/
169170
public Pattern getIndividualTimeSeriesPattern() {
170-
String subDirectory = fileHierarchy.getSubDirectory(IndividualTimeSeries.class).orElse("");
171+
String subDirectory =
172+
fileHierarchy.getSubDirectory(IndividualTimeSeries.class).orElseGet(() -> "");
171173

172174
if (subDirectory.isEmpty()) {
173175
return entityPersistenceNamingStrategy.getIndividualTimeSeriesPattern();
@@ -192,7 +194,7 @@ public Pattern getIndividualTimeSeriesPattern() {
192194
* @return A load profile time series pattern
193195
*/
194196
public Pattern getLoadProfileTimeSeriesPattern() {
195-
String subDirectory = fileHierarchy.getSubDirectory(LoadProfileInput.class).orElse("");
197+
String subDirectory = fileHierarchy.getSubDirectory(LoadProfileInput.class).orElseGet(() -> "");
196198

197199
if (subDirectory.isEmpty()) {
198200
return entityPersistenceNamingStrategy.getLoadProfileTimeSeriesPattern();
@@ -265,7 +267,8 @@ public String getIdCoordinateEntityName() {
265267
public Optional<String> getIdCoordinateFilePath() {
266268
// do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
267269
// details
268-
return getFilePath(getIdCoordinateEntityName(), fileHierarchy.getBaseDirectory().orElse(""));
270+
return getFilePath(
271+
getIdCoordinateEntityName(), fileHierarchy.getBaseDirectory().orElseGet(() -> ""));
269272
}
270273

271274
/**

0 commit comments

Comments
 (0)