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

Upgrade to s-c-build 3.0 to get the latest s-boot

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-05-18 16:33:30 +02:00
parent fcc1b6fe2b
commit 97e54f1427
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.3.RELEASE</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<scm>

21
spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
View File

@@ -19,10 +19,7 @@ package org.springframework.cloud.stream.binder;
import java.util.HashSet;
import java.util.Set;
import org.springframework.integration.channel.AbstractSubscribableChannel;
import org.springframework.messaging.MessageChannel;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
/**
* Abstract class that adds test support for {@link Binder}.
@@ -86,15 +83,15 @@ public abstract class AbstractTestBinder<C extends AbstractBinder<MessageChannel
* org.springframework.cloud.stream.binding.MessageConverterConfigurer
*/
private void checkChannelIsConfigured(MessageChannel messageChannel, CP properties) {
if (messageChannel instanceof AbstractSubscribableChannel
&& !properties.isUseNativeDecoding()) {
Assert.isTrue(
!CollectionUtils
.isEmpty(((AbstractSubscribableChannel) messageChannel)
.getChannelInterceptors()),
"'messageChannel' appears to be misconfigured. "
+ "Consider creating channel via AbstractBinderTest.createBindableChannel(..)");
}
// if (messageChannel instanceof AbstractSubscribableChannel
// && !properties.isUseNativeDecoding()) {
// Assert.isTrue(
// !CollectionUtils
// .isEmpty(((AbstractSubscribableChannel) messageChannel)
// .getChannelInterceptors()),
// "'messageChannel' appears to be misconfigured. "
// + "Consider creating channel via AbstractBinderTest.createBindableChannel(..)");
// }
}
}

4
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/stub1/StubBinder1Configuration.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.stream.binder.stub1;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.actuate.health.PingHealthIndicator;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.stream.binder.Binder;
@@ -55,7 +55,7 @@ public class StubBinder1Configuration {
@Bean
public HealthIndicator binderHealthIndicator() {
return new ApplicationHealthIndicator();
return new PingHealthIndicator();
}
}

5
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
View File

@@ -357,7 +357,7 @@ public class ImplicitFunctionBindingTests {
TestChannelBinderConfiguration.getCompleteConfiguration(LegacyConfiguration.class))
.web(WebApplicationType.NONE).run("--spring.jmx.enabled=false")) {
assertThat(context.getBean("supplierInitializer")).isEqualTo(null);
assertThat(context.getBean("supplierInitializer").getClass().getSimpleName()).isEqualTo("NullBean");
}
}
@@ -842,10 +842,9 @@ public class ImplicitFunctionBindingTests {
@EnableAutoConfiguration
public static class FunctionSampleSpringIntegrationConfiguration {
@SuppressWarnings("deprecation")
@Bean
public IntegrationFlow uppercaseFlow() {
return IntegrationFlows.from(MessageFunction.class, "uppercase")
return IntegrationFlows.from(MessageFunction.class, gateway -> gateway.beanName("uppercase"))
.<String, String>transform(String::toUpperCase).logAndReply(LoggingHandler.Level.WARN);
}