feat(file-output): add Message as an extended method for V2xMessageRe…

…ception (#400) * feat(file-output): add Payload as an extended method for V2xMessageReception * feat(file-output): add Message as an extended method for V2xMessageReception * clean: re-order methods to please checkstyle
eclipse · Aug 8, 2024 · 3502596 · 3502596
1 parent 8d8f70d
commit 3502596
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml b/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml
@@ -51,6 +51,7 @@
                     <entry>MessageId</entry>
                     <entry>ReceiverName</entry>
                     <entry>ReceiverInformation.ReceiveSignalStrength</entry>
+                    <entry>Message.Payload.EffectiveLength</entry>
                 </entries>
             </subscription>
             <subscription id="V2xMessageTransmission">
@@ -66,6 +67,7 @@
                     <entry>Message.Routing.Destination.Type</entry>
                     <entry>Message.Routing.Destination.Address.IPv4Address</entry>
                     <entry>Message.Routing.Destination.AdhocChannelId</entry>
+                    <entry>Message.Payload.EffectiveLength</entry>
                 </entries>
             </subscription>
             <subscription id="VehicleRegistration" enabled="true">

diff --git a/.../src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java b/.../src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java
@@ -38,22 +38,26 @@ public static void putV2xMessage(V2xMessage message) {
         V2X_MESSAGES.put(message.getId(), message);
     }
 
-    static public Object getType(V2xMessageReception interaction) {
+    static public Object getType(V2xMessageTransmission interaction) {
         V2xMessage message = Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId()));
         if (message instanceof GenericV2xMessage) {
             return ((GenericV2xMessage) message).getMessageType();
         }
         return message.getSimpleClassName();
     }
 
-    static public Object getType(V2xMessageTransmission interaction) {
+    static public Object getType(V2xMessageReception interaction) {
         V2xMessage message = Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId()));
         if (message instanceof GenericV2xMessage) {
             return ((GenericV2xMessage) message).getMessageType();
         }
         return message.getSimpleClassName();
     }
 
+    static public V2xMessage getMessage(V2xMessageReception interaction) {
+        return Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId()));
+    }
+
     static public Object getTimeInSec(Interaction interaction) {
         return interaction == null ? "" : interaction.getTime() / TIME.SECOND;
     }