Added logic to trigger sensor registration interactions

replace List with ArrayList in method signature/ class members

co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstance.java

@@ -17,14 +17,14 @@
 package org.eclipse.mosaic.fed.infrastructure.ambassador;
 
 import org.eclipse.mosaic.interactions.sensor.Sensor;
-import org.eclipse.mosaic.interactions.sensor.SensorRegistration;
 import org.eclipse.mosaic.lib.geo.CartesianPoint;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * InfrastructureInstance class represents a physical instance of an
@@ -41,7 +41,7 @@ public class InfrastructureInstance {
     private int simulatedInteractionPort;
     private CartesianPoint location = null;
     private DatagramSocket rxMsgsSocket = null;
-    private ArrayList<Sensor> sensors;
+    private List<Sensor> sensors;
 
     /**
      * Constructor for InfrastructureInstance
@@ -56,7 +56,7 @@ public class InfrastructureInstance {
      *                         simulated environment
      */ 
     public InfrastructureInstance(String infrastructureId, InetAddress targetAddress, int rxMessagePort,
-            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, ArrayList<Sensor> sensors) {
+            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List<Sensor> sensors) {
         this.infrastructureId = infrastructureId;
         this.targetAddress = targetAddress;
         this.rxMessagePort = rxMessagePort;

co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManager.java

@@ -21,7 +21,10 @@
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 
 import org.eclipse.mosaic.interactions.communication.V2xMessageTransmission;
 import org.eclipse.mosaic.interactions.sensor.DetectedObject;
@@ -100,7 +103,7 @@ public void onNewRegistration(InfrastructureRegistrationMessage registration) {
      * 
      */
     private void newInfrastructureInstance(String infrastructureId, InetAddress rxMessageIpAddress, int rxMessagePort,
-            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, ArrayList<Sensor> sensors) {
+            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List<Sensor> sensors) {
         InfrastructureInstance tmp = new InfrastructureInstance(infrastructureId, rxMessageIpAddress, rxMessagePort,
                 timeSyncPort, simulatedInteractionPort, location, sensors);
         try {
@@ -111,6 +114,7 @@ private void newInfrastructureInstance(String infrastructureId, InetAddress rxMe
                     infrastructureId, e.getMessage());
             log.error("Stack trace:", e);
         }
+
         managedInstances.put(infrastructureId, tmp);
     }
 

co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassador.java

@@ -27,6 +27,8 @@
 import org.eclipse.mosaic.interactions.mapping.RsuRegistration;
 import org.eclipse.mosaic.interactions.sensor.DetectedObject;
 import org.eclipse.mosaic.interactions.sensor.DetectedObjectInteraction;
+import org.eclipse.mosaic.interactions.sensor.Sensor;
+import org.eclipse.mosaic.interactions.sensor.SensorRegistration;
 import org.eclipse.mosaic.lib.enums.AdHocChannel;
 import org.eclipse.mosaic.lib.geo.GeoPoint;
 import org.eclipse.mosaic.lib.misc.Tuple;
@@ -298,6 +300,11 @@ public synchronized void processTimeAdvanceGrant(long time) throws InternalFeder
                 onRsuRegistrationRequest(reg.getInfrastructureId(), reg.getLocation().toGeo());
                 log.info("RSU Registration for "+ reg.getInfrastructureId() + " @ x, y, z: (" + reg.getLocation().getX() + ", " + reg.getLocation().getY() + ", " + reg.getLocation().getZ() + ")");
                 onDsrcRegistrationRequest(reg.getInfrastructureId());
+                log.debug("Sending SensorRegistration interactions for sensor : {}", reg.getSensors().toString());
+                for (Sensor sensor : reg.getSensors()) {
+                    // Trigger Sensor registrations for all listed sensors.
+                    this.rti.triggerInteraction(new SensorRegistration(time,sensor));
+                }
             }
 
             if (currentSimulationTime == 0) {

co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessage.java

@@ -17,6 +17,7 @@
 package org.eclipse.mosaic.fed.infrastructure.ambassador;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.mosaic.interactions.sensor.Sensor;
 import org.eclipse.mosaic.lib.geo.CartesianPoint;
@@ -46,7 +47,7 @@ public class InfrastructureRegistrationMessage {
     // Geo-coordinate of the Infrastructure Device location
     private CartesianPoint location = null;
 
-    private ArrayList<Sensor> sensors;
+    private List<Sensor> sensors;
 
 
     /**
@@ -67,7 +68,7 @@ public class InfrastructureRegistrationMessage {
      *                                  Device
      */
     public InfrastructureRegistrationMessage(String rxMessageIpAddress, String infrastructureId, int rxMessagePort,
-            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, ArrayList<Sensor> sensors) {
+            int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List<Sensor> sensors) {
         this.rxMessageIpAddress = rxMessageIpAddress;
         this.infrastructureId = infrastructureId;
         this.rxMessagePort = rxMessagePort;
@@ -181,11 +182,11 @@ public void setLocation(CartesianPoint location) {
         this.location = location;
     }
 
-    public ArrayList<Sensor> getSensors() {
+    public List<Sensor> getSensors() {
         return sensors;
     }
 
-    public void setSensors(ArrayList<Sensor> sensors) {
+    public void setSensors(List<Sensor> sensors) {
         this.sensors = sensors;
     }
 

co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorRegistration.java

@@ -21,9 +21,9 @@ public class SensorRegistration extends Interaction {
     public final static String TYPE_ID = createTypeIdentifier(SensorRegistration.class);
 
     private Sensor sensor;
-    protected SensorRegistration(long time) {
+    public SensorRegistration(long time, Sensor sensor) {
         super(time);
-        //TODO Auto-generated constructor stub
+        this.sensor = sensor;
     }
     public Sensor getSensor() {
         return sensor;