fix(v2x): API change in V2xMessage getPayLoad -> getPayload (#375)

* all occurrences using this API were adjusted accordingly BREAKING CHANGE: Applications using the `V2xMessage#getPayLoad()`-method will have to adjust to the corrected spelling of `V2xMessage#getPayload()` Signed-off-by: Moritz Schweppenhäuser <[email protected]>
eclipse · Jan 24, 2024 · 4f262b5 · 4f262b5
1 parent b17fc24
commit 4f262b5
Showing 18 changed files with 23 additions and 23 deletions.
diff --git a/...ght-communication/src/main/java/org/eclipse/mosaic/app/tutorial/message/GreenWaveMsg.java b/...ght-communication/src/main/java/org/eclipse/mosaic/app/tutorial/message/GreenWaveMsg.java
@@ -38,7 +38,7 @@ public String getMessage() {
 
     @Nonnull
     @Override
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/...-communication/src/main/java/org/eclipse/mosaic/app/tutorial/message/InterVehicleMsg.java b/...-communication/src/main/java/org/eclipse/mosaic/app/tutorial/message/InterVehicleMsg.java
@@ -48,7 +48,7 @@ public GeoPoint getSenderPosition() {
 
     @Nonnull
     @Override
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/simulation/VehicleTest.java b/...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/simulation/VehicleTest.java
@@ -179,13 +179,13 @@ private void assertCam(
 
         final V2xMessage message = ((V2xMessageTransmission) interaction).getMessage();
         Assert.assertEquals("Cam", message.getSimpleClassName());
-        Assert.assertEquals(98, message.getPayLoad().getActualLength());
-        Assert.assertEquals(200, message.getPayLoad().getMinimalLength());
+        Assert.assertEquals(98, message.getPayload().getActualLength());
+        Assert.assertEquals(200, message.getPayload().getMinimalLength());
 
         final V2xMessage concreteMsg = SimulationKernel.SimulationKernel.getV2xMessageCache().getItem(message.getId());
         Assert.assertTrue(concreteMsg instanceof Cam);
-        Assert.assertEquals(98, concreteMsg.getPayLoad().getActualLength());
-        Assert.assertEquals(200, concreteMsg.getPayLoad().getMinimalLength());
+        Assert.assertEquals(98, concreteMsg.getPayload().getActualLength());
+        Assert.assertEquals(200, concreteMsg.getPayload().getMinimalLength());
 
         Assert.assertEquals(expectedPosition, ((Cam) concreteMsg).getPosition());
 

diff --git a/fed/mosaic-cell/src/main/java/org/eclipse/mosaic/fed/cell/utility/CapacityUtility.java b/fed/mosaic-cell/src/main/java/org/eclipse/mosaic/fed/cell/utility/CapacityUtility.java
@@ -134,7 +134,7 @@ public static void consumeCapacity(TransmissionMode mode, CNetworkProperties reg
      * @return The length of the V2X message.
      */
     public static long getMessageLength(V2xMessage msg) {
-        return msg.getPayLoad().getEffectiveLength() * DATA.BYTE;
+        return msg.getPayload().getEffectiveLength() * DATA.BYTE;
     }
 
     /**

diff --git a/fed/mosaic-cell/src/test/java/org/eclipse/mosaic/fed/cell/chain/SampleV2xMessage.java b/fed/mosaic-cell/src/test/java/org/eclipse/mosaic/fed/cell/chain/SampleV2xMessage.java
@@ -35,7 +35,7 @@ public SampleV2xMessage(MessageRouting routing, long messageLengthInBits) {
 
     @Nonnull
     @Override
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 }
diff --git a/fed/mosaic-sns/src/test/java/org/eclipse/mosaic/fed/sns/ambassador/SnsAmbassadorTest.java b/fed/mosaic-sns/src/test/java/org/eclipse/mosaic/fed/sns/ambassador/SnsAmbassadorTest.java
@@ -199,7 +199,7 @@ private void sendMessage(MessageRouting routing) throws InternalFederateExceptio
         V2xMessage v2xMessage = new V2xMessage(routing) {
             @Nonnull
             @Override
-            public EncodedPayload getPayLoad() {
+            public EncodedPayload getPayload() {
                 return new EncodedPayload(0);
             }
         };

diff --git a/...saic-network/src/main/java/org/eclipse/mosaic/lib/coupling/AbstractNetworkAmbassador.java b/...saic-network/src/main/java/org/eclipse/mosaic/lib/coupling/AbstractNetworkAmbassador.java
@@ -568,7 +568,7 @@ private synchronized void process(V2xMessageTransmission interaction) throws Int
                     interaction.getTime(),
                     sourceId,
                     interaction.getMessage().getId(),
-                    interaction.getMessage().getPayLoad().getEffectiveLength(),
+                    interaction.getMessage().getPayload().getEffectiveLength(),
                     dac
             );
             if (CMD.SUCCESS != ack) {

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/GenericV2xMessage.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/GenericV2xMessage.java
@@ -66,7 +66,7 @@ public GenericV2xMessage(MessageRouting routing, ToDataOutput messagePayload, lo
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/V2xMessage.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/V2xMessage.java
@@ -81,7 +81,7 @@ protected V2xMessage(final MessageRouting routing, final int id) {
      * @return the {@link EncodedPayload} of this message
      */
     @Nonnull
-    public abstract EncodedPayload getPayLoad();
+    public abstract EncodedPayload getPayload();
 
     /**
      * Returns the globally unique id of this message.
@@ -172,7 +172,7 @@ public Empty(MessageRouting routing) {
 
         @Nonnull
         @Override
-        public EncodedPayload getPayLoad() {
+        public EncodedPayload getPayload() {
             return EncodedPayload.EMPTY_PAYLOAD;
         }
     }

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Cam.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Cam.java
@@ -41,7 +41,7 @@ public class Cam extends V2xMessage {
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payLoad;
     }
 

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Denm.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Denm.java
@@ -42,7 +42,7 @@ public class Denm extends V2xMessage {
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Ivim.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Ivim.java
@@ -41,7 +41,7 @@ public class Ivim extends V2xMessage {
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Spatm.java b/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/v2x/etsi/Spatm.java
@@ -36,7 +36,7 @@ public class Spatm extends V2xMessage {
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/lib/mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/CamContentTest.java b/lib/mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/CamContentTest.java
@@ -57,7 +57,7 @@ public void decodeMessage() {
         byte[] userTaggedValue = "this is a test".getBytes(StandardCharsets.UTF_8);
 
         Cam cam = new Cam(mock(MessageRouting.class), new CamContent(4 * TIME.SECOND, awarenessData, "veh_1", position, userTaggedValue), 200);
-        EncodedPayload encodedMessage = cam.getPayLoad();
+        EncodedPayload encodedMessage = cam.getPayload();
 
         //PRE-ASSERT
         assertNotNull(encodedMessage.getBytes());

diff --git a/...mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/DenmContentTest.java b/...mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/DenmContentTest.java
@@ -57,7 +57,7 @@ public void decodeMessage() throws IOException {
                 new DenmContent(4 * TIME.SECOND, position, "1_1_2_0", SensorType.POSITION, 4, 5f, 6f, position, eventArea, "test"),
                 200);
 
-        EncodedPayload encodedMessage = denm.getPayLoad();
+        EncodedPayload encodedMessage = denm.getPayload();
 
         //PRE-ASSERT
         assertTrue(encodedMessage.getBytes().length > 0);
@@ -83,7 +83,7 @@ public void decodeMessage() throws IOException {
                 new DenmContent(4 * TIME.SECOND, position, "1_1_2_0", SensorType.POSITION, 4, 5f, 6f, null, null, null),
                 200);
 
-        EncodedPayload encodedMessage2 = denm2.getPayLoad();
+        EncodedPayload encodedMessage2 = denm2.getPayload();
 
         //RUN
         DenmContent decodedDENM2 = (DenmContent) encodedMessage2.decodePayload();

diff --git a/...mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/IvimContentTest.java b/...mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/v2x/etsi/IvimContentTest.java
@@ -59,7 +59,7 @@ public void decodeMessage() {
         IvimContent ivimContent = new IvimContent(4 * TIME.SECOND)
                 .addSegment(segment);
         Ivim ivim = new Ivim(mock(MessageRouting.class), ivimContent, 200);
-        EncodedPayload encodedMessage = ivim.getPayLoad();
+        EncodedPayload encodedMessage = ivim.getPayload();
 
         //PRE-ASSERT
         assertTrue(encodedMessage.getBytes().length > 0);

diff --git a/...-tests/src/test/java/org/eclipse/mosaic/test/app/sendandreceive/messages/TestMessage.java b/...-tests/src/test/java/org/eclipse/mosaic/test/app/sendandreceive/messages/TestMessage.java
@@ -88,7 +88,7 @@ public TestMessage(final MessageRouting routing, final TestMessage testMessage)
 
     @Override
     @Nonnull
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return payload;
     }
 

diff --git a/...ation-tests/src/test/java/org/eclipse/mosaic/test/app/sendonshutdown/ShutdownMessage.java b/...ation-tests/src/test/java/org/eclipse/mosaic/test/app/sendonshutdown/ShutdownMessage.java
@@ -29,7 +29,7 @@ public ShutdownMessage(MessageRouting routing) {
 
     @Nonnull
     @Override
-    public EncodedPayload getPayLoad() {
+    public EncodedPayload getPayload() {
         return new EncodedPayload(8);
     }
 }