Merge pull request #2100 from beyonnex-io/bugfix/npe-in-scripted-mapping

fix NPE in ScriptedOutgoingMapping when value from script resolved to null
eclipse-ditto · Jan 21, 2025 · 4966ef4 · 4966ef4
2 parents 70c3bad + 1fb100a
commit 4966ef4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/...va/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java b/...va/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java
@@ -176,14 +176,20 @@ private static JsonObject toJsonObject(final NativeObject nativeObject) {
                     objectBuilder.set(key.toString(), JsonFactory.newValue(intValue));
                 } else if (value instanceof Double doubleValue) {
                     objectBuilder.set(key.toString(), JsonFactory.newValue(doubleValue));
+                } else if (value == null || value instanceof Undefined) {
+                    objectBuilder.set(key.toString(), JsonFactory.nullLiteral());
                 } else {
                     if (log.isDebugEnabled()){
                         log.debug("Unsupported type: {}, adding as string: {}", value.getClass().getName(), value);
                     }
                     objectBuilder.set(key.toString(), value.toString());
                 }
             } catch (final JsonParseException e) {
-                objectBuilder.set(key.toString(), value.toString());
+                if (value != null) {
+                    objectBuilder.set(key.toString(), value.toString());
+                } else {
+                    objectBuilder.set(key.toString(), JsonFactory.nullLiteral());
+                }
             }
         });
         return objectBuilder.build();

diff --git a/...ce/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java b/...ce/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java
@@ -486,6 +486,7 @@ private SendingOrDropped publishToGenericTarget(final ExpressionResolver resolve
                             DittoHeaders.newBuilder(mappedMessage.getHeaders())
                                     .removeHeader(DittoHeaderDefinition.W3C_TRACEPARENT.getKey())
                                     .build()
+                                    .asCaseSensitiveMap()
                     ));
 
             final CompletionStage<SendResult> responsesFuture = publishMessage(outboundSource,

diff --git a/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java b/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java
@@ -367,6 +367,7 @@ private void handleJmsMessage(final JmsMessage message) throws JMSException {
                     .toBuilder()
                     .removeHeader(DittoHeaderDefinition.W3C_TRACEPARENT.getKey())
                     .build()
+                    .asCaseSensitiveMap()
             );
             final ExternalMessageBuilder builder = ExternalMessageFactory.newExternalMessageBuilder(headers);
             final ExternalMessage externalMessage = extractPayloadFromMessage(message, builder)

diff --git a/.../java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaMessageTransformer.java b/.../java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaMessageTransformer.java
@@ -116,6 +116,7 @@ public TransformationResult transform(final ConsumerRecord<String, ByteBuffer> c
                 .toBuilder()
                 .removeHeader(DittoHeaderDefinition.W3C_TRACEPARENT.getKey())
                 .build()
+                .asCaseSensitiveMap()
         );
 
         try {

diff --git a/...java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQConsumerActor.java b/...java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQConsumerActor.java
@@ -155,6 +155,7 @@ private void handleDelivery(final Delivery delivery) {
                     .toBuilder()
                     .removeHeader(DittoHeaderDefinition.W3C_TRACEPARENT.getKey())
                     .build()
+                    .asCaseSensitiveMap()
             );
 
             final ExternalMessageBuilder externalMessageBuilder =