Refactoring structure.

src/main/java/edu/ie3/simona/api/ExtLinkInterface.java

@@ -6,8 +6,8 @@
 
 package edu.ie3.simona.api;
 
+import edu.ie3.simona.api.data.ExtSimAdapterData;
 import edu.ie3.simona.api.exceptions.NoExtSimulationException;
-import edu.ie3.simona.api.simulation.ExtSimAdapterData;
 import edu.ie3.simona.api.simulation.ExtSimulation;
 
 /**

src/main/java/edu/ie3/simona/api/data/ExtDataContainerQueue.java

@@ -0,0 +1,35 @@
+/*
+ * © 2024. TU Dortmund University,
+ * Institute of Energy Systems, Energy Efficiency and Energy Economics,
+ * Research group Distribution grid planning and operation
+ */
+
+package edu.ie3.simona.api.data;
+
+import edu.ie3.simona.api.data.container.ExtDataContainer;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.function.Function;
+
+/** Data queue to allow data flow between SimonaAPI and an external simulation */
+public final class ExtDataContainerQueue<V extends ExtDataContainer> {
+  private final LinkedBlockingDeque<V> receiverTriggerDeque = new LinkedBlockingDeque<>();
+
+  public void queueData(V data) throws InterruptedException {
+    receiverTriggerDeque.putLast(data);
+  }
+
+  public V takeAll() throws InterruptedException {
+    return receiverTriggerDeque.takeFirst();
+  }
+
+  public <R> R takeData(Function<V, R> extractor) throws InterruptedException {
+    V data = receiverTriggerDeque.takeFirst();
+    R result = extractor.apply(data);
+
+    if (!data.isEmpty()) {
+      receiverTriggerDeque.putFirst(data);
+    }
+
+    return result;
+  }
+}

src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java → src/main/java/edu/ie3/simona/api/data/ExtSimAdapterData.java

@@ -4,10 +4,10 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation;
+package edu.ie3.simona.api.data;
 
-import edu.ie3.simona.api.simulation.ontology.ControlMessageToExt;
-import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
+import edu.ie3.simona.api.ontology.simulation.ControlMessageToExt;
+import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.apache.pekko.actor.typed.ActorRef;
 

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

@@ -0,0 +1,54 @@
+/*
+ * © 2025. TU Dortmund University,
+ * Institute of Energy Systems, Energy Efficiency and Energy Economics,
+ * Research group Distribution grid planning and operation
+ */
+
+package edu.ie3.simona.api.data.connection;
+
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * Enables bidirectional communication when extended by an external data connection.
+ *
+ * @param <M> type of message to SIMONA
+ * @param <R> type of response messages to ext
+ */
+public abstract class BiDirectional<
+        M extends DataMessageFromExt, R extends DataResponseMessageToExt>
+    extends ExtInputDataConnection<M> implements ExtOutputDataConnection<R> {
+
+  /** Data message queue containing messages from SIMONA */
+  public final LinkedBlockingQueue<R> receiveTriggerQueue = new LinkedBlockingQueue<>();
+
+  protected BiDirectional() {
+    super();
+  }
+
+  public final void queueExtResponseMsg(R msg) throws InterruptedException {
+    receiveTriggerQueue.put(msg);
+  }
+
+  public final R receiveAny() throws InterruptedException {
+    return receiveTriggerQueue.take();
+  }
+
+  @SuppressWarnings("unchecked")
+  public final <T extends R> T receiveWithType(Class<T> expectedMessageClass)
+      throws InterruptedException {
+    // blocks until actor puts something here
+    R msg = receiveTriggerQueue.take();
+
+    if (msg.getClass().equals(expectedMessageClass)) {
+      return (T) msg;
+    } else
+      throw new RuntimeException(
+          "Received unexpected message '"
+              + msg
+              + "', expected type '"
+              + expectedMessageClass
+              + "'");
+  }
+}

src/main/java/edu/ie3/simona/api/data/ExtDataConnection.java → src/main/java/edu/ie3/simona/api/data/connection/ExtDataConnection.java

@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data;
+package edu.ie3.simona.api.data.connection;
 
 /** Interface that defines a data connection between SIMONA and an external simulation. */
 public interface ExtDataConnection {}