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

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-29176
This commit is contained in:
Stephane Nicoll
2021-12-27 12:02:57 +01:00
parent eb81cbf053 576eb50ed8
commit 2b140950e3
10 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfigurationTests.java
View File

@@ -85,7 +85,7 @@ class RabbitStreamConfigurationTests {
}
@Test
void whenCustomMessageListenerContainerIsDefinedThenAutoConfiguredContainerBacksOff() {
void whenCustomMessageListenerContainerFactoryIsDefinedThenAutoConfiguredContainerFactoryBacksOff() {
this.contextRunner.withUserConfiguration(CustomMessageListenerContainerFactoryConfiguration.class)
.run((context) -> {
assertThat(context).hasSingleBean(RabbitListenerContainerFactory.class);

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@@ -27,6 +27,7 @@ import io.rsocket.transport.ClientTransport;
import io.rsocket.transport.netty.client.TcpClientTransport;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -58,8 +59,10 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.IntegrationManagementConfigurer;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.endpoint.MessageProcessorMessageSource;
import org.springframework.integration.gateway.RequestReplyExchanger;
import org.springframework.integration.handler.MessageProcessor;
import org.springframework.integration.rsocket.ClientRSocketConnector;
import org.springframework.integration.rsocket.IntegrationRSocketEndpoint;
import org.springframework.integration.rsocket.ServerRSocketConnector;
@@ -526,9 +529,8 @@ class IntegrationAutoConfigurationTests {
static class MessageSourceConfiguration {
@Bean
org.springframework.integration.core.MessageSource<?> myMessageSource() {
return new MessageProcessorMessageSource(
mock(org.springframework.integration.handler.MessageProcessor.class));
MessageSource<?> myMessageSource() {
return new MessageProcessorMessageSource(mock(MessageProcessor.class));
}
}
@@ -541,7 +543,7 @@ class IntegrationAutoConfigurationTests {
return new IntegrationRSocketEndpoint() {
@Override
public reactor.core.publisher.Mono<Void> handleMessage(Message<?> message) {
public Mono<Void> handleMessage(Message<?> message) {
return null;
}