From c7cca938abef5640180c5a637d1cf66e2bb229e3 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
Date: Thu, 1 Mar 2018 11:12:20 +0100
Subject: [PATCH] fixed MappingContext creation from JSON

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
---
 .../ditto/model/amqpbridge/ImmutableMappingContext.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/model/amqp-bridge/src/main/java/org/eclipse/ditto/model/amqpbridge/ImmutableMappingContext.java b/model/amqp-bridge/src/main/java/org/eclipse/ditto/model/amqpbridge/ImmutableMappingContext.java
index aa6c330877..8cd340e6a2 100644
--- a/model/amqp-bridge/src/main/java/org/eclipse/ditto/model/amqpbridge/ImmutableMappingContext.java
+++ b/model/amqp-bridge/src/main/java/org/eclipse/ditto/model/amqpbridge/ImmutableMappingContext.java
@@ -83,7 +83,10 @@ public static MappingContext fromJson(final JsonObject jsonObject) {
         final String contentType = jsonObject.getValueOrThrow(JsonFields.CONTENT_TYPE);
         final String mappingEngine = jsonObject.getValueOrThrow(JsonFields.MAPPING_ENGINE);
         final Map<String, String> options = jsonObject.getValueOrThrow(JsonFields.OPTIONS).stream()
-                .collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString()));
+                .collect(Collectors.toMap(
+                        e -> e.getKey().toString(),
+                        e -> e.getValue().isString() ? e.getValue().asString() : e.getValue().toString())
+                );
 
         return of(contentType, mappingEngine, options);
     }