Skip to content

Commit 8592014

Browse files
committed
fix RabbitMQContainer
rabbitmq 3.9+ does not allow ENV variables any more see testcontainers/testcontainers-java#4312 (comment)
1 parent 06efead commit 8592014

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

smartclide-monitoring/src/test/java/de/atb/context/monitoring/TestDataRetrieval.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.time.format.DateTimeFormatter;
1010
import java.util.List;
1111
import java.util.Map;
12+
import java.util.Objects;
1213
import java.util.Properties;
1314
import java.util.concurrent.TimeoutException;
1415

@@ -18,12 +19,10 @@
1819
import com.rabbitmq.client.Connection;
1920
import com.rabbitmq.client.ConnectionFactory;
2021
import de.atb.context.common.util.ApplicationScenario;
21-
import de.atb.context.common.util.BusinessCase;
2222
import de.atb.context.monitoring.config.models.Config;
2323
import de.atb.context.monitoring.config.models.datasources.MessageBrokerDataSourceOptions;
2424
import de.atb.context.monitoring.models.GitDataModel;
2525
import de.atb.context.monitoring.models.GitMessage;
26-
import de.atb.context.monitoring.models.IMonitoringDataModel;
2726
import de.atb.context.services.AmIMonitoringService;
2827
import de.atb.context.services.IAmIMonitoringDataRepositoryService;
2928
import de.atb.context.services.IAmIMonitoringService;
@@ -52,8 +51,6 @@
5251
* @author scholze
5352
* @version $LastChangedRevision: 577 $
5453
*/
55-
56-
5754
public class TestDataRetrieval {
5855

5956
private static final Logger logger = LoggerFactory.getLogger(TestDataRetrieval.class);
@@ -75,20 +72,22 @@ public class TestDataRetrieval {
7572
// starts a new rabbitmq message broker in a docker container.
7673
// @Rule must be final.
7774
@Rule
78-
public final RabbitMQContainer container = new RabbitMQContainer(RABBITMQ_3_ALPINE);
75+
public final RabbitMQContainer container = new RabbitMQContainer(RABBITMQ_3_ALPINE).withAdminPassword(null);
7976

8077
@Before
8178
public void setup() throws Exception {
8279
final String rabbitMQContainerHost = container.getHost();
8380
final Integer rabbitMQContainerAmqpPort = container.getAmqpPort();
8481
setupBroker(rabbitMQContainerHost, rabbitMQContainerAmqpPort);
8582

86-
createFakeDleListener(rabbitMQContainerHost, rabbitMQContainerAmqpPort);
83+
createFakeDleListener();
8784

8885
Properties props = System.getProperties();
8986
props.setProperty("org.apache.cxf.stax.allowInsecureParser", "true");
9087

88+
//noinspection ConstantConditions
9189
final String monitoringConfig = Path.of(getClass().getResource("/monitoring-config.xml").toURI()).toString();
90+
//noinspection ConstantConditions
9291
final String serviceConfig = Path.of(getClass().getResource("/services-config.xml").toURI()).toString();
9392

9493
updateMessageBrokerDataSource(monitoringConfig, rabbitMQContainerHost, rabbitMQContainerAmqpPort);
@@ -102,7 +101,7 @@ public void setup() throws Exception {
102101
ServiceManager.getLSWServiceContainer().add(serviceContainer);
103102

104103
for (SWServiceContainer container : ServiceManager.getLSWServiceContainer()) {
105-
if (container.getServerClass().toString().contains("AmIMonitoringDataRepository")) {
104+
if (Objects.requireNonNull(container.getServerClass()).toString().contains("AmIMonitoringDataRepository")) {
106105
reposService = ServiceManager.getWebservice(container);
107106
}
108107
}
@@ -144,7 +143,7 @@ public void testDataRetrieval() throws IOException, InterruptedException {
144143

145144
Thread.sleep(10000);
146145

147-
// get the monitored data from the repository (latest registry)
146+
// get the monitored data from the repository (the latest registry)
148147
final List<GitDataModel> data =
149148
monitoringDataRepository.getMonitoringData(ApplicationScenario.getInstance(), GitDataModel.class, 1);
150149

@@ -189,7 +188,7 @@ private void updateMessageBrokerDataSource(final String monitoringConfig, final
189188
persister.write(config, new File(monitoringConfig));
190189
}
191190

192-
private void createFakeDleListener(final String host, final Integer port) throws IOException {
191+
private void createFakeDleListener() throws IOException {
193192
channel.exchangeDeclare(EXCHANGE_NAME, BuiltinExchangeType.TOPIC, true);
194193
final String queue = channel.queueDeclare("", true, false, false, null).getQueue();
195194
channel.queueBind(queue, EXCHANGE_NAME, ROUTING_KEY_DLE);

0 commit comments

Comments
 (0)