Merge remote-tracking branch 'origin/r1' into r1

# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/common/BrokerUtil.java
eu-nebulous · Nov 22, 2024 · 861354f · 861354f
2 parents 2a3bef2 + 3ed6586
commit 861354f
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/resource-discovery/src/main/java/eu/nebulous/resource/discovery/common/BrokerUtil.java b/resource-discovery/src/main/java/eu/nebulous/resource/discovery/common/BrokerUtil.java
@@ -200,16 +200,9 @@ public void onMessage(Message message) {
                 Object obj = objectMapper.readerFor(typeRef).readValue(payload);
 
                 if (obj instanceof Map<?,?> dataMap) {
-                    String topic = ((ActiveMQTextMessage) message).getDestination().getPhysicalName();
-                    // Print response messages except the EMS node status reports (_ui_instance_info, _client_metrics)
-                    if (StringUtils.isNotBlank(topic)
-                            && ! topic.equals(properties.getDeviceStatusMonitorTopic())
-                            && ! topic.equals(properties.getDeviceMetricsMonitorTopic()))
-                    {
-                        log.warn("BrokerUtil: Received a new message:   topic: {}", topic);
-                        log.warn("BrokerUtil: Received a new message: payload: {}", dataMap);
-                    }
-                    handlePayload(topic, dataMap);
+                    log.warn("BrokerUtil: Received a new message:   topic: {}", ((ActiveMQTextMessage) message).getDestination().getPhysicalName());
+                    log.warn("BrokerUtil: Received a new message: payload: {}", dataMap);
+                    handlePayload(((ActiveMQTextMessage) message).getDestination().getPhysicalName(), dataMap);
                 } else {
                     log.warn("BrokerUtil: Message payload is not recognized. Expected Map but got: type={}, object={}", obj.getClass().getName(), obj);
                 }