SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2511 Fix Rabbit environment tests/binder

Browse Source 
Resolves #2511
This commit is contained in:
Oleg Zhurakousky
2022-09-26 11:39:45 +02:00
parent 63b96ba135
commit 65c6274a11
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
binders/rabbit-binder/pom.xml
View File

@@ -49,13 +49,6 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>

2
binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
View File

@@ -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;

4
binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/stream/RabbitStreamBinderModuleTests.java
View File

@@ -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);