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

Upgrade to the latest Kotlin

Browse Source 
* Fix more recursive generics on factory methods
See https://jira.spring.io/browse/INT-4458

**Cherry-pick to 5.0.x**
This commit is contained in:
Artem Bilan
2018-07-25 21:08:24 -04:00
committed by Gary Russell
parent 5cbc622f4b
commit 2709bc142a
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -1,5 +1,5 @@
buildscript {
ext.kotlinVersion = '1.2.41'
ext.kotlinVersion = '1.2.51'
repositories {
maven { url 'https://repo.spring.io/plugins-release' }
}

9
spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java
View File

@@ -104,20 +104,19 @@ public class Channels {
return MessageChannels.rendezvous(id);
}
public PublishSubscribeChannelSpec<? extends PublishSubscribeChannelSpec<?>> publishSubscribe() {
public PublishSubscribeChannelSpec<?> publishSubscribe() {
return MessageChannels.publishSubscribe();
}
public PublishSubscribeChannelSpec<? extends PublishSubscribeChannelSpec<?>> publishSubscribe(Executor executor) {
public PublishSubscribeChannelSpec<?> publishSubscribe(Executor executor) {
return MessageChannels.publishSubscribe(executor);
}
public PublishSubscribeChannelSpec<? extends PublishSubscribeChannelSpec<?>> publishSubscribe(String id,
Executor executor) {
public PublishSubscribeChannelSpec<?> publishSubscribe(String id, Executor executor) {
return MessageChannels.publishSubscribe(id, executor);
}
public PublishSubscribeChannelSpec<? extends PublishSubscribeChannelSpec<?>> publishSubscribe(String id) {
public PublishSubscribeChannelSpec<?> publishSubscribe(String id) {
return MessageChannels.publishSubscribe(id);
}

17
spring-integration-core/src/main/java/org/springframework/integration/dsl/channel/MessageChannels.java
View File

@@ -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 <S extends PublishSubscribeChannelSpec<S>> PublishSubscribeChannelSpec<S> publishSubscribe() {
public static PublishSubscribeChannelSpec<?> publishSubscribe() {
return new PublishSubscribeChannelSpec<>();
}
public static <S extends PublishSubscribeChannelSpec<S>> PublishSubscribeChannelSpec<S> publishSubscribe(
String id) {
return MessageChannels.<S>publishSubscribe().id(id);
public static PublishSubscribeChannelSpec<?> publishSubscribe(String id) {
return MessageChannels.publishSubscribe().id(id);
}
public static <S extends PublishSubscribeChannelSpec<S>> PublishSubscribeChannelSpec<S> publishSubscribe(
Executor executor) {
public static PublishSubscribeChannelSpec<?> publishSubscribe(Executor executor) {
return new PublishSubscribeChannelSpec<>(executor);
}
public static <S extends PublishSubscribeChannelSpec<S>> PublishSubscribeChannelSpec<S> publishSubscribe(String id,
Executor executor) {
return MessageChannels.<S>publishSubscribe(executor).id(id);
public static PublishSubscribeChannelSpec<?> publishSubscribe(String id, Executor executor) {
return MessageChannels.publishSubscribe(executor).id(id);
}
public static FluxMessageChannelSpec flux() {

8
spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt
View File

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