Removing delay parameter from em communication.

Author: staudtMarius

build.gradle

@@ -70,7 +70,7 @@ dependencies{
   }
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.0')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.1')
   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

src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java

@@ -12,9 +12,7 @@
 import edu.ie3.simona.api.data.model.em.FlexOptions;
 import edu.ie3.simona.api.ontology.em.*;
 import java.util.*;
-import javax.measure.quantity.Time;
 import org.slf4j.Logger;
-import tech.units.indriya.ComparableQuantity;
 
 /** Enables data connection of em data between SIMONA and SimonaAPI */
 public final class ExtEmDataConnection
@@ -25,35 +23,18 @@ public final class ExtEmDataConnection
   /** Assets that are controlled by external simulation */
   private final List<UUID> controlled;
 
-  private final Optional<ComparableQuantity<Time>> maxDelay;
-
   public ExtEmDataConnection(List<UUID> controlled, EmMode mode) {
     super();
 
     this.mode = mode;
     this.controlled = controlled;
-    this.maxDelay = Optional.empty();
-  }
-
-  public ExtEmDataConnection(
-      List<UUID> controlled, EmMode mode, Optional<ComparableQuantity<Time>> maxDelay) {
-    super();
-
-    this.mode = mode;
-    this.controlled = controlled;
-    this.maxDelay = maxDelay;
   }
 
   /** Returns a list of the uuids of the em agents that expect external set points */
   public List<UUID> getControlledEms() {
     return new ArrayList<>(controlled);
   }
 
-  /** Returns the maximal delay, that is allowed for a message when using the em communication. */
-  public Optional<ComparableQuantity<Time>> getMaxDelay() {
-    return maxDelay;
-  }
-
   /**
    * Sends the em flex requests to SIMONA.
    *

src/main/java/edu/ie3/simona/api/data/container/ExtInputContainer.java

@@ -127,7 +127,7 @@ public void addSetPoint(UUID asset, PValue power) {
    * @param setPoint given set point
    */
   public void addSetPoint(EmSetPoint setPoint) {
-    setPoints.put(setPoint.receiver, setPoint);
+    setPoints.put(setPoint.receiver(), setPoint);
   }
 
   /**

src/main/java/edu/ie3/simona/api/data/model/em/EmMessageBase.java

@@ -7,19 +7,18 @@
 package edu.ie3.simona.api.data.model.em;
 
 import edu.ie3.datamodel.models.value.PValue;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import javax.measure.quantity.Power;
-import javax.measure.quantity.Time;
 import tech.units.indriya.ComparableQuantity;
 
-/** Energy management set point that will be sent to SIMONA. */
-public final class EmSetPoint extends EmMessageBase {
-
-  /** An option for the em set point. */
-  public final Optional<PValue> power;
-
+/**
+ * Energy management set point that will be sent to SIMONA
+ *
+ * @param receiver The receiver of the message.
+ * @param power An option for the em set point.
+ */
+public record EmSetPoint(UUID receiver, Optional<PValue> power) {
   /**
    * Constructor for {@link EmSetPoint}.
    *
@@ -28,8 +27,7 @@ public final class EmSetPoint extends EmMessageBase {
    * @param receiver of the set point.
    */
   public EmSetPoint(UUID receiver) {
-    super(receiver);
-    this.power = Optional.empty();
+    this(receiver, Optional.empty());
   }
 
   /**
@@ -39,8 +37,7 @@ public EmSetPoint(UUID receiver) {
    * @param p power value of the set point
    */
   public EmSetPoint(UUID receiver, ComparableQuantity<Power> p) {
-    super(receiver);
-    this.power = Optional.of(new PValue(p));
+    this(receiver, Optional.of(new PValue(p)));
   }
 
   /**
@@ -50,38 +47,6 @@ public EmSetPoint(UUID receiver, ComparableQuantity<Power> p) {
    * @param power value of the set point
    */
   public EmSetPoint(UUID receiver, PValue power) {
-    super(receiver);
-    this.power = Optional.of(power);
-  }
-
-  /**
-   * Constructor for {@link EmSetPoint}.
-   *
-   * @param receiver of the set point.
-   * @param power option for the set point
-   * @param delay option for the delay of this message
-   */
-  public EmSetPoint(
-      UUID receiver, Optional<PValue> power, Optional<ComparableQuantity<Time>> delay) {
-    super(receiver, delay);
-    this.power = power;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == null || getClass() != o.getClass()) return false;
-    if (!super.equals(o)) return false;
-    EmSetPoint that = (EmSetPoint) o;
-    return Objects.equals(power, that.power);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode(), power);
-  }
-
-  @Override
-  public String toString() {
-    return "EmSetPoint{" + "receiver=" + receiver + ", power=" + power + ", delay=" + delay + '}';
+    this(receiver, Optional.ofNullable(power));
   }
 }

src/main/java/edu/ie3/simona/api/data/model/em/EmSetPoint.java

@@ -6,18 +6,16 @@
 
 package edu.ie3.simona.api.data.model.em;
 
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import javax.measure.quantity.Time;
-import tech.units.indriya.ComparableQuantity;
-
-/** Energy management flex option request that will be sent to SIMONA. */
-public final class FlexOptionRequest extends EmMessageBase {
-
-  /** The sender of the request. */
-  public final Optional<UUID> sender;
 
+/**
+ * Energy management flex option request that will be sent to SIMONA
+ *
+ * @param receiver The receiver of the message.
+ * @param sender The sender of the request.
+ */
+public record FlexOptionRequest(UUID receiver, Optional<UUID> sender) {
   /**
    * Constructor for {@link FlexOptionRequest}. Equals {@code new FlexOptionRequest(receiver,
    * Optional.empty())}.
@@ -35,68 +33,6 @@ public FlexOptionRequest(UUID receiver) {
    * @param sender of the request
    */
   public FlexOptionRequest(UUID receiver, UUID sender) {
-    super(receiver);
-    this.sender = Optional.ofNullable(sender);
-  }
-
-  /**
-   * Constructor for {@link FlexOptionRequest}.
-   *
-   * @param receiver of the request
-   * @param sender of the request
-   */
-  public FlexOptionRequest(UUID receiver, Optional<UUID> sender) {
-    super(receiver);
-    this.sender = sender;
-  }
-
-  /**
-   * Constructor for {@link FlexOptionRequest}.
-   *
-   * @param receiver of the request
-   * @param sender of the request
-   * @param delay option for the delay of this message
-   */
-  public FlexOptionRequest(UUID receiver, UUID sender, Optional<ComparableQuantity<Time>> delay) {
-    super(receiver, delay);
-    this.sender = Optional.ofNullable(sender);
-  }
-
-  /**
-   * Constructor for {@link FlexOptionRequest}.
-   *
-   * @param receiver of the request
-   * @param sender option for the sender of the request
-   * @param delay option for the delay of this message
-   */
-  public FlexOptionRequest(
-      UUID receiver, Optional<UUID> sender, Optional<ComparableQuantity<Time>> delay) {
-    super(receiver, delay);
-    this.sender = sender;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == null || getClass() != o.getClass()) return false;
-    if (!super.equals(o)) return false;
-    FlexOptionRequest that = (FlexOptionRequest) o;
-    return Objects.equals(sender, that.sender);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode(), delay);
-  }
-
-  @Override
-  public String toString() {
-    return "FlexOptionRequest{"
-        + "receiver="
-        + receiver
-        + ", sender="
-        + sender
-        + ", delay="
-        + delay
-        + '}';
+    this(receiver, Optional.ofNullable(sender));
   }
 }