Addressing reviewer's comments

ie3-institute · Jan 10, 2022 · 0477ad7 · 0477ad7
1 parent 6898605
commit 0477ad7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
-- SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`)
+- SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`) [#467](https://github.com/ie3-institute/PowerSystemDataModel/issues/467)
 
 ### Fixed
 - Reduced code smells [#492](https://github.com/ie3-institute/PowerSystemDataModel/issues/492)

diff --git a/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java b/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java
@@ -73,7 +73,8 @@ public FileNamingStrategy() {
   public Optional<String> getFilePath(Class<? extends UniqueEntity> cls) {
     // do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
     // details
-    return getFilePath(getEntityName(cls).orElse(""), getDirectoryPath(cls).orElse(""));
+    return getFilePath(
+        getEntityName(cls).orElseGet(() -> ""), getDirectoryPath(cls).orElseGet(() -> ""));
   }
 
   /**
@@ -91,8 +92,8 @@ Optional<String> getFilePath(T timeSeries) {
     // do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
     // details
     return getFilePath(
-        entityPersistenceNamingStrategy.getEntityName(timeSeries).orElse(""),
-        getDirectoryPath(timeSeries).orElse(""));
+        entityPersistenceNamingStrategy.getEntityName(timeSeries).orElseGet(() -> ""),
+        getDirectoryPath(timeSeries).orElseGet(() -> ""));
   }
 
   /**
@@ -167,7 +168,8 @@ Optional<String> getDirectoryPath(T timeSeries) {
    * @return An individual time series pattern
    */
   public Pattern getIndividualTimeSeriesPattern() {
-    String subDirectory = fileHierarchy.getSubDirectory(IndividualTimeSeries.class).orElse("");
+    String subDirectory =
+        fileHierarchy.getSubDirectory(IndividualTimeSeries.class).orElseGet(() -> "");
 
     if (subDirectory.isEmpty()) {
       return entityPersistenceNamingStrategy.getIndividualTimeSeriesPattern();
@@ -192,7 +194,7 @@ public Pattern getIndividualTimeSeriesPattern() {
    * @return A load profile time series pattern
    */
   public Pattern getLoadProfileTimeSeriesPattern() {
-    String subDirectory = fileHierarchy.getSubDirectory(LoadProfileInput.class).orElse("");
+    String subDirectory = fileHierarchy.getSubDirectory(LoadProfileInput.class).orElseGet(() -> "");
 
     if (subDirectory.isEmpty()) {
       return entityPersistenceNamingStrategy.getLoadProfileTimeSeriesPattern();
@@ -265,7 +267,8 @@ public String getIdCoordinateEntityName() {
   public Optional<String> getIdCoordinateFilePath() {
     // do not adapt orElseGet, see https://www.baeldung.com/java-optional-or-else-vs-or-else-get for
     // details
-    return getFilePath(getIdCoordinateEntityName(), fileHierarchy.getBaseDirectory().orElse(""));
+    return getFilePath(
+        getIdCoordinateEntityName(), fileHierarchy.getBaseDirectory().orElseGet(() -> ""));
   }
 
   /**