Store sender's IP address for inbound messages in DB

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - support for Kotlin
 - preconditions which observe mdib changes during the test run
-- Sender IP adresses of inbound messages are stored in TestRun DB
+- storing of IP addresses of inbound messages in the database
 
 ### Changed
 

sdccc/src/main/java/com/draeger/medical/sdccc/messages/MessageStorage.java

@@ -94,7 +94,7 @@
 @Singleton
 public class MessageStorage implements AutoCloseable {
 
-    public static final String UNKNOWN_SENDER = "unknown";
+    public static final String UNKNOWN_SENDER = "UNKNOWN";
     public static final String DEFAULT_OUTBOUND_SENDER = "SDCcc";
     private static final Logger LOG = LogManager.getLogger(MessageStorage.class);
 
@@ -322,20 +322,30 @@ protected MessageContent convertMessageToMessageContent(final Message message) {
     private String getSender(final Message message) {
         final CommunicationContext communicationContext = message.getCommunicationContext();
         if (communicationContext == null) {
+            LOG.warn("Encountered message (uuid={}) without a CommunicationContext.", message);
             return UNKNOWN_SENDER;
         }
         final TransportInfo transportInfo = communicationContext.getTransportInfo();
         if (transportInfo == null) {
+            LOG.warn("Encountered message (uuid={}) without a TransportInfo.", message);
             return UNKNOWN_SENDER;
         }
         if (message.getDirection() == CommunicationLog.Direction.INBOUND) {
             final Optional<String> remoteAddress = transportInfo.getRemoteAddress();
             if (remoteAddress.isEmpty()) {
+                LOG.warn("Encountered inbound message (uuid={}) without a remoteAddress.", message);
                 return UNKNOWN_SENDER;
+            } else {
+                return remoteAddress.orElseThrow();
             }
-            return remoteAddress.orElseThrow();
-        } else {
+        } else if (message.getDirection() == CommunicationLog.Direction.OUTBOUND) {
             return DEFAULT_OUTBOUND_SENDER;
+        } else {
+            // NOTE: will invalidate the TestRun
+            LOG.error("Encountered unknown direction {} in message with uuid={}",
+                    message.getDirection(),
+                    message.getID());
+            return UNKNOWN_SENDER;
         }
     }
 

sdccc/src/main/java/com/draeger/medical/sdccc/messages/mapping/MessageContent.java

@@ -75,7 +75,7 @@ public class MessageContent {
     private String uuid;
     private boolean isSOAP;
 
-    @Column(name = "sender", length = 15)
+    @Column(name = "sender")
     private String sender;
 
     /**
@@ -98,8 +98,7 @@ public MessageContent() {}
      * @param uuid                 identifier for ensuring, that a message was written to the database
      * @param isSOAP               shall be true if a SOAP envelope was found and false otherwise
      * @param sender               either the String "SDCcc" for outbound messages or the IP Address of the
-     *                             message Sender for inbound messages. NOTE: The String's length must be shorter or
-     *                             equal to 15 characters in order to be stored in the database.
+     *                             message Sender for inbound messages.
      */
     public MessageContent(
             final String body,

sdccc/src/main/java/com/draeger/medical/sdccc/messages/mapping/MessageContent_.java

@@ -40,6 +40,7 @@ public final class MessageContent_ {
     public static volatile SingularAttribute<MessageContent, String> scheme;
     public static volatile SingularAttribute<MessageContent, String> uuid;
     public static volatile SingularAttribute<MessageContent, Boolean> isSOAP;
+    public static volatile SingularAttribute<MessageContent, String> sender;
 
     private MessageContent_() {}
 }