From 65c6274a1186185c23328de0136e19759371e8c4 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 26 Sep 2022 11:39:45 +0200 Subject: [PATCH] GH-2511 Fix Rabbit environment tests/binder Resolves #2511 --- binders/rabbit-binder/pom.xml | 7 ------- .../stream/binder/rabbit/RabbitMessageChannelBinder.java | 2 +- .../rabbit/stream/RabbitStreamBinderModuleTests.java | 4 +++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/binders/rabbit-binder/pom.xml b/binders/rabbit-binder/pom.xml index a0c6d9bfc..a11047fd0 100644 --- a/binders/rabbit-binder/pom.xml +++ b/binders/rabbit-binder/pom.xml @@ -49,13 +49,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - false - - org.apache.maven.plugins maven-compiler-plugin diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java index f4497c75f..e37f56a88 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java @@ -316,7 +316,7 @@ public class RabbitMessageChannelBinder extends "the RabbitMQ binder does not support embedded headers since RabbitMQ supports headers natively"); String prefix = producerProperties.getExtension().getPrefix(); String exchangeName = producerDestination.getName(); - String destination = StringUtils.isEmpty(prefix) ? exchangeName + String destination = !StringUtils.hasText(prefix) ? exchangeName : exchangeName.substring(prefix.length()); RabbitProducerProperties extendedProperties = producerProperties.getExtension(); final MessageHandler endpoint; diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/stream/RabbitStreamBinderModuleTests.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/stream/RabbitStreamBinderModuleTests.java index 4571e5f29..18f0f015f 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/stream/RabbitStreamBinderModuleTests.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/stream/RabbitStreamBinderModuleTests.java @@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.listener.MessageListenerContainer; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.binder.BinderFactory; import org.springframework.cloud.stream.binder.Binding; @@ -128,7 +129,8 @@ public class RabbitStreamBinderModuleTests { } @Bean - Environment env(ConsumerBuilder consumerBuilder, ProducerBuilder producerBuilder) { + @ConditionalOnMissingBean + Environment rabbitStreamEnvironment(ConsumerBuilder consumerBuilder, ProducerBuilder producerBuilder) { Environment env = mock(Environment.class); given(env.consumerBuilder()).willReturn(consumerBuilder); given(env.producerBuilder()).willReturn(producerBuilder);