Skip to content

Commit 96adc08

Browse files
committed
Adapt AMQP tests to latest Rabbit Streams Client
Related to spring-projects/spring-amqp#2522 No need to use an `AddressResolver` with the latest RabbitMQ Streams Client library The current configuration is reflecting whatever Spring Boot auto-configuration experience would expect from us
1 parent a8b9a3d commit 96adc08

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/dsl/RabbitStreamTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.integration.amqp.dsl;
1818

19-
import com.rabbitmq.stream.Address;
2019
import com.rabbitmq.stream.Environment;
2120
import org.junit.jupiter.api.Test;
2221

@@ -103,7 +102,7 @@ RabbitTemplate rabbitTemplate(ConnectionFactory rabbitConnectionFactory) {
103102
@Bean
104103
Environment rabbitStreamEnvironment() {
105104
return Environment.builder()
106-
.addressResolver(add -> new Address("localhost", RabbitTestContainer.streamPort()))
105+
.port(RabbitTestContainer.streamPort())
107106
.build();
108107
}
109108

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/RabbitStreamMessageHandlerTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.concurrent.TimeUnit;
2121
import java.util.concurrent.atomic.AtomicReference;
2222

23-
import com.rabbitmq.stream.Address;
2423
import com.rabbitmq.stream.Consumer;
2524
import com.rabbitmq.stream.Environment;
2625
import com.rabbitmq.stream.OffsetSpecification;
@@ -46,7 +45,7 @@ public class RabbitStreamMessageHandlerTests implements RabbitTestContainer {
4645
void convertAndSend() throws InterruptedException {
4746
Environment env = Environment.builder()
4847
.lazyInitialization(true)
49-
.addressResolver(add -> new Address("localhost", RabbitTestContainer.streamPort()))
48+
.port(RabbitTestContainer.streamPort())
5049
.build();
5150
try {
5251
env.deleteStream("stream.stream");
@@ -83,7 +82,7 @@ void convertAndSend() throws InterruptedException {
8382
@Test
8483
void sendNative() throws InterruptedException {
8584
Environment env = Environment.builder()
86-
.addressResolver(add -> new Address("localhost", RabbitTestContainer.streamPort()))
85+
.port(RabbitTestContainer.streamPort())
8786
.lazyInitialization(true)
8887
.build();
8988
try {

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/RabbitTestContainer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public interface RabbitTestContainer {
3535

3636
RabbitMQContainer RABBITMQ = new RabbitMQContainer("rabbitmq:management")
3737
.withExposedPorts(5672, 15672, 5552)
38-
.withEnv("RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS", "-rabbitmq_stream advertised_host localhost")
3938
.withStartupTimeout(Duration.ofMinutes(2));
4039

4140
@BeforeAll

0 commit comments

Comments
 (0)