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

Polish "Add service connection for Docker Compose and Testcontainers Artemis"

Browse Source 
See gh-39311
This commit is contained in:
Moritz Halbritter
2024-01-30 15:50:55 +01:00
parent f15cd93a35
commit 1f321c4421
6 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactory.java
View File

@@ -27,6 +27,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
* {@link ArtemisConnectionDetails} for an {@code artemis} service.
*
* @author Eddú Meléndez
* @author Moritz Halbritter
*/
class ArtemisDockerComposeConnectionDetailsFactory
extends DockerComposeConnectionDetailsFactory<ArtemisConnectionDetails> {
@@ -34,7 +35,7 @@ class ArtemisDockerComposeConnectionDetailsFactory
private static final int ACTIVEMQ_PORT = 61616;
protected ArtemisDockerComposeConnectionDetailsFactory() {
super("apache/activemq-classic");
super("apache/activemq-artemis");
}
@Override

5
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironment.java
View File

@@ -22,6 +22,7 @@ import java.util.Map;
* Artemis environment details.
*
* @author Eddú Meléndez
* @author Moritz Halbritter
*/
class ArtemisEnvironment {
@@ -30,8 +31,8 @@ class ArtemisEnvironment {
private final String password;
ArtemisEnvironment(Map<String, String> env) {
this.user = env.get("ACTIVEMQ_CONNECTION_USER");
this.password = env.get("ACTIVEMQ_CONNECTION_PASSWORD");
this.user = env.get("ARTEMIS_USER");
this.password = env.get("ARTEMIS_PASSWORD");
}
String getUser() {