From 70032d1a0bb6fd7adb45f2e2c8a9b16ac12bcdbc Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Wed, 2 Jul 2025 13:36:04 +0300 Subject: [PATCH] Fix sonar findings (#2526) Signed-off-by: Avgustin Marinov --- .../test/AbstractAmqpIntegrationTest.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java index bf6ebcc95..82f52e069 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java @@ -10,7 +10,6 @@ package org.eclipse.hawkbit.rabbitmq.test; import java.time.Duration; -import java.util.Properties; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; @@ -61,6 +60,7 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes private static final Duration AT_LEAST = Duration.ofMillis(Integer.getInteger("hawkbit.it.amqp.await.atLeastMs", 100)); private static final Duration POLL_INTERVAL = Duration.ofMillis(Integer.getInteger("hawkbit.it.amqp.await.pollIntervalMs", 200)); private static final Duration TIMEOUT = Duration.ofMillis(Integer.getInteger("hawkbit.it.amqp.await.timeoutMs", 5000)); + @Override protected ConditionFactory await() { return Awaitility.await().atLeast(AT_LEAST).pollInterval(POLL_INTERVAL).atMost(TIMEOUT); } @@ -73,18 +73,6 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes return getDmfClient().getMessageConverter().toMessage(payload, messageProperties); } - protected int getQueueMessageCount(final String queueName) { - final Properties queueProps = rabbitAdmin.getQueueProperties(queueName); - if (queueProps != null && queueProps.containsKey(RabbitAdmin.QUEUE_MESSAGE_COUNT)) { - return Integer.parseInt(queueProps.get(RabbitAdmin.QUEUE_MESSAGE_COUNT).toString()); - } - final int fallbackCount = 0; - log.warn( - "Cannot determine the queue message count for queue '{}' (queue properties {}). Returning queue message count {}.", - queueName, queueProps, fallbackCount); - return fallbackCount; - } - protected RabbitAdmin getRabbitAdmin() { return rabbitAdmin; } @@ -93,10 +81,6 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes return connectionFactory.getVirtualHost(); } - protected int getPort() { - return connectionFactory.getPort(); - } - private RabbitTemplate createDmfClient() { final RabbitTemplate template = new RabbitTemplate(connectionFactory); template.setMessageConverter(new Jackson2JsonMessageConverter());