Merge pull request #1006 from ie3-institute/dependabot/gradle/dev/com.github.ie3-institute-PowerSystemUtils-2.1

Bump com.github.ie3-institute:PowerSystemUtils from 2.0 to 2.2

Author: sebastian-peter

CHANGELOG.md

@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `CsvDataSource` throws exceptions on error [#954](https://github.com/ie3-institute/PowerSystemDataModel/issues/954)
 - Removing `uuid` as required column from input and result time series [#826](https://github.com/ie3-institute/PowerSystemDataModel/issues/826)
 - Removing the support for the old csv format that was marked `deprecated` back in version `1.1.0` [#795](https://github.com/ie3-institute/PowerSystemDataModel/issues/795)
+- BREAKING: Updating PowerSystemUtils dependency to 2.2 [#1006](https://github.com/ie3-institute/PowerSystemDataModel/issues/1006)
 
 ## [4.1.0] - 2023-11-02
 

build.gradle

@@ -53,7 +53,7 @@ repositories {
 dependencies {
 
   //	 ie³ power system utils
-  implementation 'com.github.ie3-institute:PowerSystemUtils:2.0'
+  implementation 'com.github.ie3-institute:PowerSystemUtils:2.2'
 
   implementation 'tech.units:indriya:2.2'
 

src/main/java/edu/ie3/datamodel/io/factory/result/ConnectorResultFactory.java

@@ -14,6 +14,7 @@
 import edu.ie3.datamodel.models.result.connector.Transformer2WResult;
 import edu.ie3.datamodel.models.result.connector.Transformer3WResult;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.ElectricCurrent;
@@ -37,10 +38,11 @@ public ConnectorResultFactory() {
    * Create a new factory to build {@link ConnectorResult}s and utilize the given date time
    * formatter pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter to parse date time strings
    */
-  public ConnectorResultFactory(String dtfPattern) {
-    super(dtfPattern, LineResult.class, Transformer2WResult.class, Transformer3WResult.class);
+  public ConnectorResultFactory(DateTimeFormatter dateTimeFormatter) {
+    super(
+        dateTimeFormatter, LineResult.class, Transformer2WResult.class, Transformer3WResult.class);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/result/FlexOptionsResultFactory.java

@@ -9,6 +9,7 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.result.system.FlexOptionsResult;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import javax.measure.quantity.Power;
 import tech.units.indriya.ComparableQuantity;
@@ -27,10 +28,10 @@ public FlexOptionsResultFactory() {
    * Create a new factory to build {@link FlexOptionsResult}s and utilize the given date time
    * formatter pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter to parse date time strings
    */
-  public FlexOptionsResultFactory(String dtfPattern) {
-    super(dtfPattern, FlexOptionsResult.class);
+  public FlexOptionsResultFactory(DateTimeFormatter dateTimeFormatter) {
+    super(dateTimeFormatter, FlexOptionsResult.class);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/result/NodeResultFactory.java

@@ -9,6 +9,7 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.result.NodeResult;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Dimensionless;
@@ -26,10 +27,10 @@ public NodeResultFactory() {
    * Create a new factory to build {@link NodeResult}s and utilize the given date time formatter
    * pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter to parse date time strings
    */
-  public NodeResultFactory(String dtfPattern) {
-    super(dtfPattern, NodeResult.class);
+  public NodeResultFactory(DateTimeFormatter dateTimeFormatter) {
+    super(dateTimeFormatter, NodeResult.class);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/result/ResultEntityFactory.java

@@ -9,8 +9,7 @@
 import edu.ie3.datamodel.io.factory.EntityFactory;
 import edu.ie3.datamodel.models.result.ResultEntity;
 import edu.ie3.util.TimeUtil;
-import java.time.ZoneId;
-import java.util.Locale;
+import java.time.format.DateTimeFormatter;
 
 /**
  * Internal API for building {@link ResultEntity}s. This additional abstraction layer is necessary
@@ -31,8 +30,9 @@ protected ResultEntityFactory(Class<? extends T>... allowedClasses) {
     timeUtil = TimeUtil.withDefaults;
   }
 
-  protected ResultEntityFactory(String dtfPattern, Class<? extends T>... allowedClasses) {
+  protected ResultEntityFactory(
+      DateTimeFormatter dateTimeFormatter, Class<? extends T>... allowedClasses) {
     super(allowedClasses);
-    timeUtil = new TimeUtil(ZoneId.of("UTC"), Locale.GERMANY, dtfPattern);
+    timeUtil = new TimeUtil(dateTimeFormatter);
   }
 }

src/main/java/edu/ie3/datamodel/io/factory/result/SwitchResultFactory.java

@@ -8,6 +8,7 @@
 import edu.ie3.datamodel.io.factory.EntityData;
 import edu.ie3.datamodel.models.result.connector.SwitchResult;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public class SwitchResultFactory extends ResultEntityFactory<SwitchResult> {
@@ -22,10 +23,10 @@ public SwitchResultFactory() {
    * Create a new factory to build {@link SwitchResult}s and utilize the given date time formatter
    * pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter Pattern to parse date time strings
    */
-  public SwitchResultFactory(String dtfPattern) {
-    super(dtfPattern, SwitchResult.class);
+  public SwitchResultFactory(DateTimeFormatter dateTimeFormatter) {
+    super(dateTimeFormatter, SwitchResult.class);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/result/SystemParticipantResultFactory.java

@@ -13,6 +13,7 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.result.system.*;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import javax.measure.quantity.Dimensionless;
 import javax.measure.quantity.Power;
@@ -48,11 +49,11 @@ public SystemParticipantResultFactory() {
    * Create a new factory to build {@link SystemParticipantResult}s and utilize the given date time
    * formatter pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter to parse date time strings
    */
-  public SystemParticipantResultFactory(String dtfPattern) {
+  public SystemParticipantResultFactory(DateTimeFormatter dateTimeFormatter) {
     super(
-        dtfPattern,
+        dateTimeFormatter,
         LoadResult.class,
         FixedFeedInResult.class,
         BmResult.class,

src/main/java/edu/ie3/datamodel/io/factory/result/ThermalResultFactory.java

@@ -13,6 +13,7 @@
 import edu.ie3.datamodel.models.result.thermal.ThermalHouseResult;
 import edu.ie3.datamodel.models.result.thermal.ThermalUnitResult;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import javax.measure.quantity.Dimensionless;
 import javax.measure.quantity.Energy;
@@ -34,10 +35,10 @@ public ThermalResultFactory() {
    * Create a new factory to build {@link ThermalResultFactory}s and utilize the given date time
    * formatter pattern to parse date time strings
    *
-   * @param dtfPattern Pattern to parse date time strings
+   * @param dateTimeFormatter parse date time strings
    */
-  public ThermalResultFactory(String dtfPattern) {
-    super(dtfPattern, ThermalHouseResult.class, CylindricalStorageResult.class);
+  public ThermalResultFactory(DateTimeFormatter dateTimeFormatter) {
+    super(dateTimeFormatter, ThermalHouseResult.class, CylindricalStorageResult.class);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

@@ -12,6 +12,7 @@
 import edu.ie3.util.quantities.PowerSystemUnits;
 import edu.ie3.util.quantities.interfaces.Irradiance;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -36,8 +37,8 @@ public CosmoTimeBasedWeatherValueFactory(TimeUtil timeUtil) {
     super(timeUtil);
   }
 
-  public CosmoTimeBasedWeatherValueFactory(String timePattern) {
-    super(timePattern);
+  public CosmoTimeBasedWeatherValueFactory(DateTimeFormatter dateTimeFormatter) {
+    super(dateTimeFormatter);
   }
 
   public CosmoTimeBasedWeatherValueFactory() {