From 016bada08beb5c7ebc8dedee715d545f8cf91f46 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Sat, 23 Nov 2024 11:15:56 +0200
Subject: [PATCH] Fix unused tenant param in AmqpMessageDispatcherService
 (#2101)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .../amqp/AmqpMessageDispatcherService.java    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java
index 90e342190..34b040545 100644
--- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java
+++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java
@@ -149,12 +149,11 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
      */
     @EventListener(classes = TargetAssignDistributionSetEvent.class)
     protected void targetAssignDistributionSet(final TargetAssignDistributionSetEvent assignedEvent) {
-        if (!shouldBeProcessed(assignedEvent)) {
+        if (shouldSkip(assignedEvent)) {
             return;
         }
 
-        final List<Target> filteredTargetList = getTargetsWithoutPendingCancellations(
-                assignedEvent.getTenant(), assignedEvent.getActions().keySet());
+        final List<Target> filteredTargetList = getTargetsWithoutPendingCancellations(assignedEvent.getActions().keySet());
 
         if (!filteredTargetList.isEmpty()) {
             log.debug("targetAssignDistributionSet retrieved. I will forward it to DMF broker.");
@@ -169,7 +168,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
      */
     @EventListener(classes = MultiActionEvent.class)
     protected void onMultiAction(final MultiActionEvent multiActionEvent) {
-        if (!shouldBeProcessed(multiActionEvent)) {
+        if (shouldSkip(multiActionEvent)) {
             return;
         }
 
@@ -227,7 +226,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
      */
     @EventListener(classes = CancelTargetAssignmentEvent.class)
     protected void targetCancelAssignmentToDistributionSet(final CancelTargetAssignmentEvent cancelEvent) {
-        if (!shouldBeProcessed(cancelEvent)) {
+        if (shouldSkip(cancelEvent)) {
             return;
         }
 
@@ -250,7 +249,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
      */
     @EventListener(classes = TargetDeletedEvent.class)
     protected void targetDelete(final TargetDeletedEvent deleteEvent) {
-        if (!shouldBeProcessed(deleteEvent)) {
+        if (shouldSkip(deleteEvent)) {
             return;
         }
 
@@ -277,8 +276,8 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
                 IpUtil.createAmqpUri(virtualHost, ping.getMessageProperties().getReplyTo()));
     }
 
-    protected boolean shouldBeProcessed(final RemoteApplicationEvent event) {
-        return isFromSelf(event);
+    protected boolean shouldSkip(final RemoteApplicationEvent event) {
+        return !isFromSelf(event);
     }
 
     protected void sendCancelMessageToTarget(final String tenant, final String controllerId, final Long actionId, final URI address) {
@@ -430,7 +429,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
                 : EventTopic.BATCH_DOWNLOAD_AND_INSTALL;
     }
 
-    private List<Target> getTargetsWithoutPendingCancellations(final String tenant, final Set<String> controllerIds) {
+    private List<Target> getTargetsWithoutPendingCancellations(final Set<String> controllerIds) {
         return partitionedParallelExecution(controllerIds, partition ->
                 targetManagement.getByControllerID(partition).stream()
                         .filter(target -> {
@@ -520,7 +519,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
     }
 
     private void sendDeleteMessage(final String tenant, final String controllerId, final String targetAddress) {
-        if (!hasValidAddress(targetAddress)) {
+        if (hasInvalidAddress(targetAddress)) {
             return;
         }
 
@@ -528,8 +527,8 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
         amqpSenderService.sendMessage(message, URI.create(targetAddress));
     }
 
-    private boolean hasValidAddress(final String targetAddress) {
-        return targetAddress != null && IpUtil.isAmqpUri(URI.create(targetAddress));
+    private boolean hasInvalidAddress(final String targetAddress) {
+        return targetAddress == null || !IpUtil.isAmqpUri(URI.create(targetAddress));
     }
 
     private boolean isFromSelf(final RemoteApplicationEvent event) {
@@ -541,7 +540,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
     }
 
     private void sendUpdateAttributesMessageToTarget(final String tenant, final String controllerId, final String targetAddress) {
-        if (!hasValidAddress(targetAddress)) {
+        if (hasInvalidAddress(targetAddress)) {
             return;
         }