diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml index 64f21fd93..92367251c 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml @@ -10,65 +10,65 @@ --> - - 4.0.0 - - org.eclipse.hawkbit - hawkbit-dmf-parent - ${revision} - - hawkbit-dmf-rabbitmq-test - hawkBit :: DMF :: RabbitMq Test module + + 4.0.0 + + org.eclipse.hawkbit + hawkbit-dmf-parent + ${revision} + + hawkbit-dmf-rabbitmq-test + hawkBit :: DMF :: RabbitMq Test module - - - org.eclipse.hawkbit - hawkbit-repository-api - ${project.version} - - - org.eclipse.hawkbit - hawkbit-repository-core - ${project.version} - - - org.eclipse.hawkbit - hawkbit-repository-jpa - ${project.version} - - - org.eclipse.hawkbit - hawkbit-dmf-api - ${project.version} - - - org.springframework.amqp - spring-rabbit-junit - compile - - - com.rabbitmq - http-client - compile - - - org.springframework.boot - spring-boot-starter-web - compile - - - org.springframework.amqp - spring-rabbit-test - compile - - - org.eclipse.hawkbit - hawkbit-repository-test - ${project.version} - compile - - + + + org.eclipse.hawkbit + hawkbit-repository-api + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-core + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-jpa + ${project.version} + + + org.eclipse.hawkbit + hawkbit-dmf-api + ${project.version} + + + org.springframework.amqp + spring-rabbit-junit + compile + + + com.rabbitmq + http-client + compile + + + org.springframework.boot + spring-boot-starter-web + compile + + + org.springframework.amqp + spring-rabbit-test + compile + + + org.eclipse.hawkbit + hawkbit-repository-test + ${project.version} + compile + + \ No newline at end of file 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 24c072a28..1565f8f69 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 @@ -37,13 +37,13 @@ import org.springframework.test.context.ContextConfiguration; @Slf4j @RabbitAvailable @ContextConfiguration(classes = { RepositoryApplicationConfiguration.class, AmqpTestConfiguration.class, - TestConfiguration.class}) + TestConfiguration.class }) @Import(TestChannelBinderConfiguration.class) // Dirty context is necessary to create a new vhost and recreate all necessary // beans after every test class. @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTest { - + private static final Duration TIMEOUT = Duration.ofSeconds(5); @Autowired @@ -93,6 +93,14 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes return rabbitAdmin; } + protected String getVirtualHost() { + return connectionFactory.getVirtualHost(); + } + + protected int getPort() { + return connectionFactory.getPort(); + } + private RabbitTemplate createDmfClient() { final RabbitTemplate template = new RabbitTemplate(connectionFactory); template.setMessageConverter(new Jackson2JsonMessageConverter()); @@ -102,12 +110,4 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes return template; } - protected String getVirtualHost() { - return connectionFactory.getVirtualHost(); - } - - protected int getPort() { - return connectionFactory.getPort(); - } - } diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java index a0e320a33..e5165b0c2 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java @@ -36,6 +36,16 @@ import org.springframework.security.concurrent.DelegatingSecurityContextExecutor @Configuration public class AmqpTestConfiguration { + @Bean + @Primary + public RabbitTemplate rabbitTemplateForTest(final ConnectionFactory connectionFactory) { + final RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); + rabbitTemplate.setMessageConverter(new Jackson2JsonMessageConverter()); + rabbitTemplate.setReplyTimeout(TimeUnit.SECONDS.toMillis(3)); + rabbitTemplate.setReceiveTimeout(TimeUnit.SECONDS.toMillis(3)); + return rabbitTemplate; + } + @Bean SystemSecurityContextHolder systemSecurityContextHolder() { return SystemSecurityContextHolder.getInstance(); @@ -79,17 +89,7 @@ public class AmqpTestConfiguration { } @Bean - RabbitMqSetupService rabbitMqSetupService(){ + RabbitMqSetupService rabbitMqSetupService() { return new RabbitMqSetupService(); } - - @Bean - @Primary - public RabbitTemplate rabbitTemplateForTest(final ConnectionFactory connectionFactory) { - final RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); - rabbitTemplate.setMessageConverter(new Jackson2JsonMessageConverter()); - rabbitTemplate.setReplyTimeout(TimeUnit.SECONDS.toMillis(3)); - rabbitTemplate.setReceiveTimeout(TimeUnit.SECONDS.toMillis(3)); - return rabbitTemplate; - } } diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java index 5e1f048d3..38fa52080 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java @@ -16,14 +16,13 @@ import java.util.UUID; import jakarta.annotation.PreDestroy; +import com.rabbitmq.http.client.Client; +import com.rabbitmq.http.client.domain.UserPermissions; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.junit.BrokerRunningSupport; import org.springframework.util.ObjectUtils; -import com.rabbitmq.http.client.Client; -import com.rabbitmq.http.client.domain.UserPermissions; - /** * Creates and deletes a new virtual host if the rabbit mq management api is * available. @@ -32,17 +31,12 @@ import com.rabbitmq.http.client.domain.UserPermissions; @SuppressWarnings("squid:S2068") public class RabbitMqSetupService { - private Client rabbitmqHttpClient; - private final com.rabbitmq.client.ConnectionFactory connectionFactory; - - private String virtualHost; - private final String hostname; - private final String username; - private final String password; + private Client rabbitmqHttpClient; + private String virtualHost; public RabbitMqSetupService() { @@ -53,18 +47,6 @@ public class RabbitMqSetupService { password = brokerSupport.getPassword(); } - @SuppressWarnings("java:S112") - private synchronized Client getRabbitmqHttpClient() { - if (rabbitmqHttpClient == null) { - try { - rabbitmqHttpClient = new Client(new URL(getHttpApiUrl()), getUsername(), getPassword()); - } catch (final MalformedURLException | URISyntaxException e) { - throw new RuntimeException(e); - } - } - return rabbitmqHttpClient; - } - public String getHttpApiUrl() { return "http://" + getHostname() + ":15672/api/"; } @@ -85,6 +67,18 @@ public class RabbitMqSetupService { getRabbitmqHttpClient().deleteVhost(virtualHost); } + @SuppressWarnings("java:S112") + private synchronized Client getRabbitmqHttpClient() { + if (rabbitmqHttpClient == null) { + try { + rabbitmqHttpClient = new Client(new URL(getHttpApiUrl()), getUsername(), getPassword()); + } catch (final MalformedURLException | URISyntaxException e) { + throw new RuntimeException(e); + } + } + return rabbitmqHttpClient; + } + private String getHostname() { return hostname; } diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java index ff4637686..2f2b8f9b1 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java @@ -16,9 +16,8 @@ public interface TestRabbitListener { /** * handle incoming message - * - * @param message - * the message + * + * @param message the message */ void handleMessage(Message message); }