diff --git a/build.gradle b/build.gradle index fcb97569d5..3933f8247d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlinVersion = '1.2.41' + ext.kotlinVersion = '1.2.51' repositories { maven { url 'https://repo.spring.io/plugins-release' } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java index 0e932ae4fb..bae15c4ff4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java @@ -104,20 +104,19 @@ public class Channels { return MessageChannels.rendezvous(id); } - public PublishSubscribeChannelSpec> publishSubscribe() { + public PublishSubscribeChannelSpec publishSubscribe() { return MessageChannels.publishSubscribe(); } - public PublishSubscribeChannelSpec> publishSubscribe(Executor executor) { + public PublishSubscribeChannelSpec publishSubscribe(Executor executor) { return MessageChannels.publishSubscribe(executor); } - public PublishSubscribeChannelSpec> publishSubscribe(String id, - Executor executor) { + public PublishSubscribeChannelSpec publishSubscribe(String id, Executor executor) { return MessageChannels.publishSubscribe(id, executor); } - public PublishSubscribeChannelSpec> publishSubscribe(String id) { + public PublishSubscribeChannelSpec publishSubscribe(String id) { return MessageChannels.publishSubscribe(id); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/channel/MessageChannels.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/channel/MessageChannels.java index 0c4900b3f0..faa51b25fc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/channel/MessageChannels.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/channel/MessageChannels.java @@ -69,6 +69,7 @@ public final class MessageChannels { public static QueueChannelSpec.MessageStoreSpec queue(String id, ChannelMessageStore messageGroupStore, Object groupId) { + return queue(messageGroupStore, groupId).id(id); } @@ -102,26 +103,24 @@ public final class MessageChannels { public static PriorityChannelSpec priority(String id, PriorityCapableChannelMessageStore messageGroupStore, Object groupId) { + return priority(messageGroupStore, groupId).id(id); } - public static > PublishSubscribeChannelSpec publishSubscribe() { + public static PublishSubscribeChannelSpec publishSubscribe() { return new PublishSubscribeChannelSpec<>(); } - public static > PublishSubscribeChannelSpec publishSubscribe( - String id) { - return MessageChannels.publishSubscribe().id(id); + public static PublishSubscribeChannelSpec publishSubscribe(String id) { + return MessageChannels.publishSubscribe().id(id); } - public static > PublishSubscribeChannelSpec publishSubscribe( - Executor executor) { + public static PublishSubscribeChannelSpec publishSubscribe(Executor executor) { return new PublishSubscribeChannelSpec<>(executor); } - public static > PublishSubscribeChannelSpec publishSubscribe(String id, - Executor executor) { - return MessageChannels.publishSubscribe(executor).id(id); + public static PublishSubscribeChannelSpec publishSubscribe(String id, Executor executor) { + return MessageChannels.publishSubscribe(executor).id(id); } public static FluxMessageChannelSpec flux() { diff --git a/spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt b/spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt index 97e909ec6e..47e9d11dfa 100644 --- a/spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt +++ b/spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt @@ -27,6 +27,8 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.integration.config.EnableIntegration import org.springframework.integration.dsl.IntegrationFlow +import org.springframework.integration.dsl.channel.MessageChannels +import org.springframework.integration.support.MessageBuilder import org.springframework.messaging.MessageChannel import org.springframework.messaging.PollableChannel import org.springframework.messaging.support.GenericMessage @@ -83,6 +85,12 @@ class RouterDslTests { .channel { c -> c.queue("routerTwoSubFlowsOutput") } } + + @Bean + fun publishSubscribe() = + MessageChannels.publishSubscribe() + .ignoreFailures(true) + .applySequence(false) } }