Merge pull request #334 from Cumulocity-IoT/develop

Develop

Author: switschel

dynamic-mapping-service/src/main/java/dynamic/mapping/connector/mqtt/MQTT3Callback.java

@@ -135,7 +135,7 @@ public void accept(Mqtt3Publish mqttMessage) {
                                 }
                                 hasErrors = true;
                                 log.error(
-                                        "{} - Error in processing context for topic: [{}], not sending ack to MQTT broker",
+                                        "{} - Error in processing context for topic: [{}]",
                                         tenant, topic);
                                 break;
                             }
@@ -151,7 +151,7 @@ public void accept(Mqtt3Publish mqttMessage) {
                     } else if (httpStatusCode < 500) {
                         // Errors found but not a server error, acknowledge the message
                         log.warn(
-                                "{} - END: Sending manual ack for MQTT message: topic: [{}], QoS: {}, connector: {}",
+                                "{} - END: Sending manual ack due to non-Server error for MQTT message: topic: [{}], QoS: {}, connector: {}",
                                 tenant, mqttMessage.getTopic(), mqttMessage.getQos().ordinal(), connectorIdentifier);
                         mqttMessage.acknowledge();
                     } else {

dynamic-mapping-service/src/main/java/dynamic/mapping/connector/mqtt/MQTT5Callback.java

@@ -135,7 +135,7 @@ public void accept(Mqtt5Publish mqttMessage) {
                                 }
                                 hasErrors = true;
                                 log.error(
-                                        "{} - Error in processing context for topic: [{}], not sending ack to MQTT broker",
+                                        "{} - Error in processing context for topic: [{}]",
                                         tenant, topic);
                                 break;
                             }
@@ -151,7 +151,7 @@ public void accept(Mqtt5Publish mqttMessage) {
                     } else if (httpStatusCode < 500) {
                         // Errors found but not a server error, acknowledge the message
                         log.warn(
-                                "{} - END: Sending manual ack for MQTT message: topic: [{}], QoS: {}, connector: {}",
+                                "{} - END: Sending manual ack due to non-Server error for MQTT message: topic: [{}], QoS: {}, connector: {}",
                                 tenant, mqttMessage.getTopic(), mqttMessage.getQos().ordinal(), connectorIdentifier);
                         mqttMessage.acknowledge();
                     } else {

dynamic-mapping-service/src/main/java/dynamic/mapping/processor/inbound/DispatcherInbound.java

@@ -195,13 +195,13 @@ public List<ProcessingContext<?>> call() throws Exception {
                         try {
                             contextSemaphore.acquire();
                             graalsContext = setupGraalVMContext(this.graalsEngine);
-//                            context.setGraalsContext(graalsContext);
+                            context.setGraalsContext(graalsContext);
 //                            context.setSharedSource(configurationRegistry.getGraalsSourceShared(tenant));
 //                            context.setSystemSource(configurationRegistry.getGraalsSourceSystem(tenant));
 //                            context.setMappingSource(configurationRegistry.getGraalsSourceMapping(tenant, mapping.id));
                             context.setSharedCode(serviceConfiguration.getCodeTemplates()
                                      .get(TemplateType.SHARED.name()).getCode());
-                             context.setSystemCode(serviceConfiguration.getCodeTemplates()
+                            context.setSystemCode(serviceConfiguration.getCodeTemplates()
                                      .get(TemplateType.SYSTEM.name()).getCode());
                         } catch (Exception e) {
                             handleGraalVMError(tenant, mapping, e, context, mappingStatus);