Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add service connection for Testcontainers ActiveMQ"

Browse Source 
This also adds support for Docker Compose.

See gh-35080
This commit is contained in:
Stephane Nicoll
2023-07-17 16:51:46 +02:00
parent 63121dd08a
commit 311fa6272d
11 changed files with 277 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactory.java
View File

@@ -16,8 +16,6 @@
package org.springframework.boot.testcontainers.service.connection.activemq;
import java.util.Map;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
@@ -34,7 +32,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
* @author Eddú Meléndez
*/
class ActiveMQContainerConnectionDetailsFactory
extends ContainerConnectionDetailsFactory<ActiveMQConnectionDetails, Container<?>> {
extends ContainerConnectionDetailsFactory<Container<?>, ActiveMQConnectionDetails> {
ActiveMQContainerConnectionDetailsFactory() {
super("symptoma/activemq");
@@ -45,33 +43,26 @@ class ActiveMQContainerConnectionDetailsFactory
return new ActiveMQContainerConnectionDetails(source);
}
private static final class ActiveMQContainerConnectionDetails extends ContainerConnectionDetails
private static final class ActiveMQContainerConnectionDetails extends ContainerConnectionDetails<Container<?>>
implements ActiveMQConnectionDetails {
private final String brokerUrl;
private final Map<String, String> envVars;
private ActiveMQContainerConnectionDetails(ContainerConnectionSource<Container<?>> source) {
super(source);
this.brokerUrl = "tcp://" + source.getContainer().getHost() + ":"
+ source.getContainer().getFirstMappedPort();
this.envVars = source.getContainer().getEnvMap();
}
@Override
public String getBrokerUrl() {
return this.brokerUrl;
return "tcp://" + getContainer().getHost() + ":" + getContainer().getFirstMappedPort();
}
@Override
public String getUser() {
return this.envVars.get("ACTIVEMQ_USERNAME");
return getContainer().getEnvMap().get("ACTIVEMQ_USERNAME");
}
@Override
public String getPassword() {
return this.envVars.get("ACTIVEMQ_PASSWORD");
return getContainer().getEnvMap().get("ACTIVEMQ_PASSWORD");
}
}