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 4d20fe5e1e
commit 9d17e09f31
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,20 +96,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/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() {