Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix missing headers from message after js mapper #2078

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix missing headers from message after js mapper #2078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...va/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.eclipse.ditto.protocol.JsonifiableAdaptable;
import org.eclipse.ditto.protocol.ProtocolFactory;
import org.mozilla.javascript.Callable;
import org.mozilla.javascript.ConsString;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.NativeArray;
Expand All @@ -51,6 +52,8 @@
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.Undefined;
import org.mozilla.javascript.typedarrays.NativeArrayBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Mapping function for outgoing messages based on JavaScript.
Expand All @@ -63,6 +66,7 @@ public final class ScriptedOutgoingMapping implements MappingFunction<Adaptable,
private static final String EXTERNAL_MESSAGE_BYTE_PAYLOAD = "bytePayload";

private static final String OUTGOING_FUNCTION_NAME = "mapFromDittoProtocolMsgWrapper";
private static final Logger log = LoggerFactory.getLogger(ScriptedOutgoingMapping.class);

@Nullable private final ContextFactory contextFactory;
@Nullable private final Scriptable scope;
Expand Down Expand Up @@ -159,11 +163,24 @@ private static JsonObject toJsonObject(final NativeObject nativeObject) {
nativeObject.forEach((key, value) -> {
try {
if (value instanceof String) {
objectBuilder.set(key.toString(), JsonFactory.readFrom(value.toString()));
objectBuilder.set(key.toString(), JsonFactory.newValue(value.toString()));
} else if (value instanceof ConsString consString) {
objectBuilder.set(key.toString(), JsonFactory.newValue(consString.toString()));
} else if (value instanceof NativeArray nativeArray) {
objectBuilder.set(key.toString(), toJsonArray(nativeArray));
} else if (value instanceof NativeObject nativeSubObject) {
objectBuilder.set(key.toString(), toJsonObject(nativeSubObject));
} else if (value instanceof Boolean boolValue) {
objectBuilder.set(key.toString(), JsonFactory.newValue(boolValue));
} else if (value instanceof Integer intValue) {
objectBuilder.set(key.toString(), JsonFactory.newValue(intValue));
} else if (value instanceof Double doubleValue) {
objectBuilder.set(key.toString(), JsonFactory.newValue(doubleValue));
} 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());
Expand Down
Loading