Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Removed log4j binding dependency from moquette

Rich Turner2a5934d3af1c
diff --git a/manager/build.gradle b/manager/build.gradle
index 4766df034..83a93340b 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -24,7 +24,9 @@ dependencies {
force = true
}
- compile "io.moquette:moquette-broker:$moquetteVersion"
+ compile ("io.moquette:moquette-broker:$moquetteVersion") {
+ exclude module: "slf4j-log4j12" // Don't want log4J
+ }
}
// Load version properties file and use same version as source code
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 0358a76e9..3d6a76c0a 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -106,7 +106,8 @@ public class MqttBrokerService implements ContainerService {
.when(body().isInstanceOf(TriggeredEventSubscription.class))
.process(exchange -> {
String sessionKey = getSessionKey(exchange);
- TriggeredEventSubscription<AttributeEvent> triggeredEventSubscription = exchange.getIn().getBody(TriggeredEventSubscription.class);
+ @SuppressWarnings("unchecked")
+ TriggeredEventSubscription<AttributeEvent> triggeredEventSubscription = (TriggeredEventSubscription<AttributeEvent>)exchange.getIn().getBody(TriggeredEventSubscription.class);
triggeredEventSubscription.getEvents()
.forEach(event -> sendAttributeEvent(sessionKey, event));
})