Rework InfrastructureInstance API to expose typed methods to encode a…

…nd send appropriate messages

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

@@ -23,7 +23,11 @@
 import java.util.List;
 
 import org.eclipse.mosaic.lib.geo.CartesianPoint;
+import org.eclipse.mosaic.lib.objects.detector.DetectedObject;
 import org.eclipse.mosaic.lib.objects.detector.Detector;
+import org.eclipse.mosaic.rti.api.Interaction;
+
+import com.google.gson.Gson;
 
 /**
  * InfrastructureInstance class represents a physical instance of an
@@ -216,13 +220,11 @@ public boolean containsSensor(String sensorId) {
     }
 
     /**
-     * Creates a DatagramSocket object and binds it to this infrastructure
-     * instance's receive message port
+     * Creates a DatagramSocket object
      * 
-     * @throws IOException if there is an issue with the underlying socket object or
-     *                     methods
+     * @throws IOException if there is an issue with the underlying socket object
      */
-    public void bind() throws IOException {
+    public void connect() throws IOException {
         socket = new DatagramSocket();
     }
 
@@ -244,17 +246,29 @@ public void sendV2xMsg(byte[] data) throws IOException {
      * @param data The binary data to transmit
      * @throws IOException If there is an issue with the underlying socket object or methods
      */
-    public void sendTimeSyncMsg(byte[] data) throws IOException {
-        sendPacket(data, timeSyncPort);
+    public void sendTimeSyncMsg(InfrastructureTimeMessage message) throws IOException {
+        sendPacket(toJsonBytes(message), timeSyncPort);
+    }
+
+    /**
+     * Helper method to serialize message into JSON and encode as bytes.
+     * 
+     * @param message java object containing message information
+     * @return bytes encoded from JSON string representation of object.
+     */
+    private byte[] toJsonBytes(Object message) {
+        Gson gson = new Gson();
+        return gson.toJson(message).getBytes();
     }
+
     /**
      * Sends time sync data to the Infrastrucutre Instance Simulated Interaction port.
      * 
      * @param data The binary data to transmit
      * @throws IOException If there is an issue with the underlying socket object or methods
      */
-    public void sendInteraction(byte[] data) throws IOException {
-        sendPacket(data, simulatedInteractionPort);
+    public void sendDetection(DetectedObject detectedObject) throws IOException {
+        sendPacket(toJsonBytes(detectedObject), simulatedInteractionPort);
     }
     /**
      * Method to send byte data to specified port using the infrastructure instance Datagramsocket.
@@ -263,7 +277,7 @@ public void sendInteraction(byte[] data) throws IOException {
      * @param port in integer format to send Datagram to.
      * @throws IOException
      */
-    public void sendPacket(byte[] data, int port) throws IOException {
+    private void sendPacket(byte[] data, int port) throws IOException {
          if (socket == null) {
             throw new IllegalStateException("Attempted to send data before opening socket");
         }

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

@@ -105,7 +105,7 @@ private void newInfrastructureInstance(String infrastructureId, InetAddress rxMe
         InfrastructureInstance tmp = new InfrastructureInstance(infrastructureId, rxMessageIpAddress, rxMessagePort,
                 timeSyncPort, simulatedInteractionPort, location, sensors);
         try {
-            tmp.bind();
+            tmp.connect();
             log.info("New Infrastructure instance '{}' registered with Infrastructure Instance Manager.",
                     infrastructureId);
         } catch (IOException e) {
@@ -183,7 +183,7 @@ public void onDetectedObject(DetectedObject detection) {
         for (InfrastructureInstance instance : managedInstances.values()) {
             if (instance.containsSensor(detection.getSensorId())) {
                 try {
-                    instance.sendInteraction(encodeMsg(detection));
+                    instance.sendDetection(detection);
                     // Assuming each sensor would only ever be registered to a single infrastructure
                     // instance
                     break;
@@ -194,17 +194,7 @@ public void onDetectedObject(DetectedObject detection) {
         }
     }
 
-    /**
-     * Helper method to serialize message into JSON and encode as bytes.
-     * 
-     * @param message java object containing message information
-     * @return bytes encoded from JSON string representation of object.
-     */
-    private byte[] encodeMsg(Object message) {
-        Gson gson = new Gson();
-        return gson.toJson(message).getBytes();
-    }
-
+
 
     /**
      * This function is used to send out encoded timestep update to all registered
@@ -220,7 +210,7 @@ public void onTimeStepUpdate(InfrastructureTimeMessage message) throws IOExcepti
         }
 
         for (InfrastructureInstance currentInstance : managedInstances.values()) {
-            currentInstance.sendTimeSyncMsg(encodeMsg(message));
+            currentInstance.sendTimeSyncMsg(message);
         }
     }
 

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java

@@ -40,7 +40,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.gson.Gson;
 
 public class InfrastructureInstanceManagerTest {
 
@@ -114,12 +113,10 @@ public void testOnTimeStepUpdate() throws IOException {
         message.setSeq(3);
         message.setTimestep(300);
         manager.onTimeStepUpdate(message);
-        Gson gson = new Gson();
-        byte[] datagram = gson.toJson(message).getBytes();
         // Verify that all instances sendTimeSyncMsgs was called.
-        verify(instance1).sendTimeSyncMsg(datagram);
-        verify(instance2).sendTimeSyncMsg(datagram);
-        verify(instance2).sendTimeSyncMsg(datagram);
+        verify(instance1).sendTimeSyncMsg(message);
+        verify(instance2).sendTimeSyncMsg(message);
+        verify(instance2).sendTimeSyncMsg(message);
 
     }
 
@@ -142,11 +139,9 @@ public void testOnDetectedObject() throws IOException{
         detectedObject1.setAngularVelocityCovariance(covarianceMatrix);
         // Attempt to send detected object to infrastructure instance
         manager.onDetectedObject(detectedObject1);
-        Gson gson = new Gson();
-        byte[] datagram1 = gson.toJson(detectedObject1).getBytes();
         // Verify Infrastructure Manager attempted to sent Detected Object
         // to instance1
-        verify(instance1, times(1)).sendInteraction(datagram1);
+        verify(instance1, times(1)).sendDetection(detectedObject1);
         // Create second detected object
         DetectedObject detectedObject2 = new DetectedObject(
                 DetectionType.VAN,
@@ -162,10 +157,9 @@ public void testOnDetectedObject() throws IOException{
         detectedObject2.setVelocityCovariance(covarianceMatrix);
         detectedObject2.setAngularVelocityCovariance(covarianceMatrix);
         manager.onDetectedObject(detectedObject2);
-        byte[] datagram2 = gson.toJson(detectedObject2).getBytes();
-        doThrow(new IOException("Something went wrong")).when(instance3).sendInteraction(datagram2);
-        verify(instance3, times(1)).sendInteraction(datagram2);
-        verify(instance2, never()).sendInteraction(any(byte[].class));
+        doThrow(new IOException("Something went wrong")).when(instance3).sendDetection(detectedObject2);
+        verify(instance3, times(1)).sendDetection(detectedObject2);
+        verify(instance2, never()).sendDetection(any(DetectedObject.class));
     }
 
 }

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceTest.java

@@ -30,14 +30,20 @@
 import java.util.ArrayList;
 
 import org.eclipse.mosaic.lib.geo.CartesianPoint;
+import org.eclipse.mosaic.lib.math.Vector3d;
+import org.eclipse.mosaic.lib.objects.detector.DetectedObject;
+import org.eclipse.mosaic.lib.objects.detector.DetectionType;
 import org.eclipse.mosaic.lib.objects.detector.Detector;
 import org.eclipse.mosaic.lib.objects.detector.DetectorType;
 import org.eclipse.mosaic.lib.objects.detector.Orientation;
+import org.eclipse.mosaic.lib.objects.detector.Size;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.internal.util.reflection.FieldSetter;
 
+import com.google.gson.Gson;
+
 public class InfrastructureInstanceTest {
     /**
      * Mock Datagram socket
@@ -148,31 +154,54 @@ public void testSendV2xMsg() throws IOException {
     @Test
     public void testSendTimeSyncMsg() throws IOException {
         // Test SendTimeSyncMsg method
-        String test_msg = "test message";
-        instance.sendTimeSyncMsg(test_msg.getBytes());
+        InfrastructureTimeMessage test_msg = new InfrastructureTimeMessage();
+        test_msg.setSeq(1);
+        test_msg.setTimestep(100);
+        instance.sendTimeSyncMsg(test_msg);
+
+
         // ArgumentCaptor to capture parameters passed to mock on method calls
         ArgumentCaptor<DatagramPacket> packet = ArgumentCaptor.forClass(DatagramPacket.class);
         // Verify socket.send(DatagramPacket packet) is called and capture packet
         // parameter
         verify(socket, times(1)).send(packet.capture());
+        // Convert message to bytes
+        Gson gson = new Gson();
+        byte[] message_bytes = gson.toJson(test_msg).getBytes();
         // Verify parameter members
-        assertArrayEquals(test_msg.getBytes(), packet.getValue().getData());
+        assertArrayEquals(message_bytes, packet.getValue().getData());
         assertEquals(instance.getTimeSyncPort(), packet.getValue().getPort());
         assertEquals(address, packet.getValue().getAddress());
     }
 
     @Test
     public void testSendInteraction() throws IOException {
         // Test SendInteraction method
-        String test_msg = "test message";
-        instance.sendInteraction(test_msg.getBytes());
+        DetectedObject test_msg = new DetectedObject(
+                DetectionType.BUS,
+                0.5,
+                "sensor1",
+                "projection String",
+                "Object1",
+                CartesianPoint.xyz(1.1, 2, 3.2),
+                new Vector3d(0, 0, 0),
+                new Vector3d(),
+                new Size(0, 0, 0));
+        Double[] covarianceMatrix = new Double[] { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
+        test_msg.setPositionCovariance(covarianceMatrix);
+        test_msg.setVelocityCovariance(covarianceMatrix);
+        test_msg.setAngularVelocityCovariance(covarianceMatrix);
+        instance.sendDetection(test_msg);
         // ArgumentCaptor to capture parameters passed to mock on method calls
         ArgumentCaptor<DatagramPacket> packet = ArgumentCaptor.forClass(DatagramPacket.class);
         // Verify socket.send(DatagramPacket packet) is called and capture packet
         // parameter
         verify(socket, times(1)).send(packet.capture());
+        // Convert message to bytes
+        Gson gson = new Gson();
+        byte[] message_bytes = gson.toJson(test_msg).getBytes();
         // Verify parameter members
-        assertArrayEquals(test_msg.getBytes(), packet.getValue().getData());
+        assertArrayEquals(message_bytes, packet.getValue().getData());
         assertEquals(instance.getSimulatedInteractionPort(), packet.getValue().getPort());
         assertEquals(address, packet.getValue().getAddress());
     }

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassadorTest.java

@@ -267,7 +267,6 @@ else if (interaction.getClass().equals(AdHocCommunicationConfiguration.class)) {
         // Assert that no other interactions were triggered
         assertEquals(0, otherInteractions.size());
 
-
     }
 
 }