Merge branch 'dev' into ms/#642-find-and-add-standard-asset-types

Author: staudtMarius

.github/dependabot.yml

@@ -15,14 +15,4 @@ updates:
   ignore:
   - dependency-name: org.spockframework:spock-core
     versions:
-        - 2.1-groovy-2.5-SNAPSHOT
-        - 2.1-groovy-3.0-SNAPSHOT
-        - 2.2-groovy-2.5-SNAPSHOT
-        - 2.2-groovy-3.0-SNAPSHOT
-        - 2.2-groovy-4.0-SNAPSHOT
-        - 2.2-M1-groovy-2.5
-        - 2.2-M1-groovy-3.0
-        - 2.2-M1-groovy-4.0
-        - 2.2-M2-groovy-2.5
-        - 2.2-M2-groovy-3.0
-        - 2.2-M2-groovy-4.0
+        - 2.3-groovy-4.0

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `ThermalUnits` as a container to hold all thermal units [#134](https://github.com/ie3-institute/PowerSystemDataModel/issues/134)
 - `ThermalInput` as a distinct abstract class for all thermal models
 - `ThermalGrid` as a container for a completely connected thermal grid
+- `EmResult` and `FlexOptionsResult` for Energy Management Systems [#651](https://github.com/ie3-institute/PowerSystemDataModel/issues/651)
+- `EvcsInput` now has a parameter for enabling and disabling vehicle to grid support [#681](https://github.com/ie3-institute/PowerSystemDataModel/issues/681)
 
 ### Fixed
 - Reduced code smells [#492](https://github.com/ie3-institute/PowerSystemDataModel/issues/492)
@@ -41,6 +43,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `BufferedCsvWriter` writes columns in the order, that the headline elements are defined [#434](https://github.com/ie3-institute/PowerSystemDataModel/issues/393)
 - Cleaned up `IndividualTimeSeriesMetaInformation`-related methods in `CsvFileConnector` [#544](https://github.com/ie3-institute/PowerSystemDataModel/issues/544)
 - Fixed spotlessApply handling for `.groovy` files [#637](https://github.com/ie3-institute/PowerSystemDataModel/issues/637)
+- Re-using SQL connection per default [#653](https://github.com/ie3-institute/PowerSystemDataModel/issues/653)
+- Persisting EmInputs [#665](https://github.com/ie3-institute/PowerSystemDataModel/issues/665)
+- Charging point type parsing now works with more id definitions [#686](https://github.com/ie3-institute/PowerSystemDataModel/issues/685)
 
 ### Changed
 - BREAKING: PvInput Model parameter name height changed to elevationAngle [#393](https://github.com/ie3-institute/PowerSystemDataModel/issues/393) :warning:

Jenkinsfile

@@ -25,7 +25,6 @@ String sshCredentialsId = '19f16959-8a0d-4a60-bd1f-5adb4572b702' // id that matc
 
 /* ci configuration */
 String sonarqubeProjectKey = 'edu.ie3:PowerSystemDataModel' // sonarqube project key, case-sensitive
-String codeCovTokenId = 'psdm-codecov-token' // id that matches the code coverage token set as jenkins property
 
 /* maven central configuration */
 String mavenCentralCredentialsId = '87bfb2d4-7613-4816-9fe1-70dfd7e6dec2' // id that matches the maven central credentials set as jenkins property
@@ -191,12 +190,6 @@ node {
         // publish reports
         publishReports(projectName)
 
-        // call codecov.io
-        withCredentials([
-          string(credentialsId: codeCovTokenId, variable: 'codeCovToken')
-        ]) {
-          sh "curl -s https://codecov.io/bash | bash -s - -t ${env.codeCovToken} -C ${commitHash}"
-        }
       }
 
     } catch (Exception e) {

build.gradle

@@ -4,9 +4,9 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '6.9.1'//code format
-  id 'com.github.spotbugs' version '5.0.9' // code check, working on byte code
-  id 'de.undercouch.download' version '5.1.0'
+  id 'com.diffplug.spotless' version '6.11.0'//code format
+  id 'com.github.spotbugs' version '5.0.12' // code check, working on byte code
+  id 'de.undercouch.download' version '5.2.1'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
   id "org.sonarqube" version "3.4.0.2513" // sonarqube
@@ -17,7 +17,7 @@ ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
   tscfgVersion = '0.9.9'
-  testcontainersVersion = '1.17.3'
+  testcontainersVersion = '1.17.5'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }
@@ -73,9 +73,10 @@ dependencies {
   implementation 'org.jgrapht:jgrapht-core:1.5.1'
 
   // testing
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
-  testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0'
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
+  testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
   testImplementation 'org.objenesis:objenesis:3.3' // Mock creation with constructor parameters
+  testImplementation 'net.bytebuddy:byte-buddy:1.12.18' // Mocks of classes
 
   // testcontainers (docker framework for testing)
   testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -85,15 +86,15 @@ dependencies {
   testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.18.0')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.19.0')
   implementation 'org.apache.logging.log4j:log4j-api' // log4j
   implementation 'org.apache.logging.log4j:log4j-core' // log4j
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.23'
-  implementation 'com.couchbase.client:java-client:3.3.3'
-  runtimeOnly 'org.postgresql:postgresql:42.4.1' // postgresql jdbc driver required during runtime
+  implementation 'com.couchbase.client:java-client:3.3.4'
+  runtimeOnly 'org.postgresql:postgresql:42.5.0' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.11.0' // I/O functionalities
   implementation 'org.apache.commons:commons-compress:1.21' // I/O functionalities

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

@@ -74,13 +74,14 @@ public int executeUpdate(String updateQuery) {
   }
 
   /**
-   * Establishes and returns a new database connection
+   * Establishes and returns a database connection. If a connection has not been established yet, a
+   * new one is created.
    *
    * @return the connection object
    * @throws SQLException if the connection could not be established
    */
   public Connection getConnection() throws SQLException {
-    return getConnection(false);
+    return getConnection(true);
   }
 
   /**
@@ -92,12 +93,15 @@ public Connection getConnection() throws SQLException {
    * @throws SQLException if the connection could not be established
    */
   public Connection getConnection(boolean reuseConnection) throws SQLException {
-    if (!reuseConnection || connection == null || connection.isClosed())
+    if (!reuseConnection || connection == null || connection.isClosed()) {
       try {
+        if (connection != null) connection.close();
+
         connection = DriverManager.getConnection(jdbcUrl, connectionProps);
       } catch (SQLException e) {
         throw new SQLException("Could not establish connection: ", e);
       }
+    }
     return connection;
   }
 

src/main/java/edu/ie3/datamodel/io/factory/FactoryData.java

@@ -146,7 +146,10 @@ field, getField(field)),
    */
   public UUID[] getUUIDs(String field) {
     try {
-      String[] uuidFields = field.split(" ");
+      String fieldValue = getField(field);
+      if (fieldValue.trim().isEmpty()) return new UUID[0];
+
+      String[] uuidFields = fieldValue.split(" ");
       return Arrays.stream(uuidFields).map(UUID::fromString).toArray(UUID[]::new);
     } catch (IllegalArgumentException iae) {
       throw new FactoryException(

src/main/java/edu/ie3/datamodel/io/factory/input/participant/EmInputFactory.java

@@ -53,7 +53,11 @@ protected EmInput buildModel(
           id);
       controlStrategy = ControlStrategy.DefaultControlStrategies.NO_CONTROL_STRATEGY;
     }
-    final UUID[] connectedAssets = data.getUUIDs(data.getField(CONNECTED_ASSETS));
+    final UUID[] connectedAssets = data.getUUIDs(CONNECTED_ASSETS);
+
+    if (connectedAssets.length == 0)
+      logger.warn("There are no connected assets for energy management system \"{}\".", id);
+
     return new EmInput(
         uuid,
         id,

src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java

@@ -33,14 +33,15 @@ public class EvcsInputFactory
   private static final String CHARGING_POINTS = "chargingpoints";
   private static final String COS_PHI_RATED = "cosphirated";
   private static final String LOCATION_TYPE = "locationtype";
+  private static final String V2G_SUPPORT = "v2gsupport";
 
   public EvcsInputFactory() {
     super(EvcsInput.class);
   }
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {TYPE, CHARGING_POINTS, COS_PHI_RATED, LOCATION_TYPE};
+    return new String[] {TYPE, CHARGING_POINTS, COS_PHI_RATED, LOCATION_TYPE, V2G_SUPPORT};
   }
 
   @Override
@@ -77,6 +78,8 @@ protected EvcsInput buildModel(
           e);
     }
 
+    final boolean v2gSupport = data.getBoolean(V2G_SUPPORT);
+
     return new EvcsInput(
         uuid,
         id,
@@ -87,6 +90,7 @@ protected EvcsInput buildModel(
         type,
         chargingPoints,
         cosPhi,
-        locationType);
+        locationType,
+        v2gSupport);
   }
 }

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

@@ -0,0 +1,59 @@
+/*
+ * © 2022. TU Dortmund University,
+ * Institute of Energy Systems, Energy Efficiency and Energy Economics,
+ * Research group Distribution grid planning and operation
+*/
+package edu.ie3.datamodel.io.factory.result;
+
+import edu.ie3.datamodel.io.factory.SimpleEntityData;
+import edu.ie3.datamodel.models.StandardUnits;
+import edu.ie3.datamodel.models.result.system.FlexOptionsResult;
+import java.time.ZonedDateTime;
+import java.util.*;
+import javax.measure.quantity.Power;
+import tech.units.indriya.ComparableQuantity;
+
+public class FlexOptionsResultFactory extends ResultEntityFactory<FlexOptionsResult> {
+
+  private static final String P_REF = "pref";
+  private static final String P_MIN = "pmin";
+  private static final String P_MAX = "pmax";
+
+  public FlexOptionsResultFactory() {
+    super(FlexOptionsResult.class);
+  }
+
+  /**
+   * 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
+   */
+  public FlexOptionsResultFactory(String dtfPattern) {
+    super(dtfPattern, FlexOptionsResult.class);
+  }
+
+  @Override
+  protected List<Set<String>> getFields(SimpleEntityData data) {
+    Set<String> minConstructorParams = newSet(TIME, INPUT_MODEL, P_REF, P_MIN, P_MAX);
+    Set<String> optionalFields = expandSet(minConstructorParams, ENTITY_UUID);
+
+    return Arrays.asList(minConstructorParams, optionalFields);
+  }
+
+  @Override
+  protected FlexOptionsResult buildModel(SimpleEntityData data) {
+    ZonedDateTime zdtTime = timeUtil.toZonedDateTime(data.getField(TIME));
+    UUID inputModelUuid = data.getUUID(INPUT_MODEL);
+    ComparableQuantity<Power> pRef = data.getQuantity(P_REF, StandardUnits.ACTIVE_POWER_RESULT);
+    ComparableQuantity<Power> pMin = data.getQuantity(P_MIN, StandardUnits.ACTIVE_POWER_RESULT);
+    ComparableQuantity<Power> pMax = data.getQuantity(P_MAX, StandardUnits.ACTIVE_POWER_RESULT);
+
+    Optional<UUID> uuidOpt =
+        data.containsKey(ENTITY_UUID) ? Optional.of(data.getUUID(ENTITY_UUID)) : Optional.empty();
+
+    return uuidOpt
+        .map(uuid -> new FlexOptionsResult(uuid, zdtTime, inputModelUuid, pRef, pMin, pMax))
+        .orElseGet(() -> new FlexOptionsResult(zdtTime, inputModelUuid, pRef, pMin, pMax));
+  }
+}

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

@@ -40,7 +40,8 @@ public SystemParticipantResultFactory() {
         StorageResult.class,
         EvcsResult.class,
         EvResult.class,
-        HpResult.class);
+        HpResult.class,
+        EmResult.class);
   }
 
   /**
@@ -61,7 +62,8 @@ public SystemParticipantResultFactory(String dtfPattern) {
         StorageResult.class,
         EvcsResult.class,
         EvResult.class,
-        HpResult.class);
+        HpResult.class,
+        EmResult.class);
   }
 
   @Override
@@ -116,6 +118,10 @@ protected SystemParticipantResult buildModel(SimpleEntityData data) {
       return uuidOpt
           .map(uuid -> new EvcsResult(uuid, zdtTime, inputModelUuid, p, q))
           .orElseGet(() -> new EvcsResult(zdtTime, inputModelUuid, p, q));
+    } else if (entityClass.equals(EmResult.class)) {
+      return uuidOpt
+          .map(uuid -> new EmResult(uuid, zdtTime, inputModelUuid, p, q))
+          .orElseGet(() -> new EmResult(zdtTime, inputModelUuid, p, q));
     } else if (SystemParticipantWithHeatResult.class.isAssignableFrom(entityClass)) {
       /* The following classes all have a heat component as well */
       ComparableQuantity<Power> qDot = data.getQuantity(Q_DOT, StandardUnits.Q_DOT_RESULT);