Fix empty bundle payload

grafnu · Apr 18, 2024 · dc76bc0 · dc76bc0
1 parent 7bf1efd
commit dc76bc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/messaging/impl/MessageBase.java b/udmis/src/main/java/com/google/bos/udmi/service/messaging/impl/MessageBase.java
@@ -15,6 +15,7 @@
 import static com.google.udmi.util.JsonUtil.fromString;
 import static com.google.udmi.util.JsonUtil.parseJson;
 import static com.google.udmi.util.JsonUtil.stringify;
+import static com.google.udmi.util.JsonUtil.stringifyTerse;
 import static java.lang.String.format;
 import static java.util.Objects.isNull;
 import static java.util.Objects.requireNonNull;
@@ -525,6 +526,13 @@ public Bundle(Map<String, String> attributes, Object message) {
       this.attributesMap = attributes;
       this.message = message;
     }
+
+    public byte[] getSendBytes() {
+      checkState(message == null || payload == null, "no message or payload");
+      checkState(!(message != null && payload != null), "no message or payload");
+      String send = ifNotNullGet(message, m -> stringifyTerse(message), payload);
+      return send.getBytes();
+    }
   }
 
   /**

diff --git a/udmis/src/main/java/com/google/bos/udmi/service/messaging/impl/SimpleMqttPipe.java b/udmis/src/main/java/com/google/bos/udmi/service/messaging/impl/SimpleMqttPipe.java
@@ -145,7 +145,7 @@ private String makeBrokerUrl(EndpointConfiguration endpoint) {
 
   private MqttMessage makeMqttMessage(Bundle bundle) {
     MqttMessage message = new MqttMessage();
-    message.setPayload(bundle.payload.getBytes());
+    message.setPayload(bundle.getSendBytes());
     return message;
   }