Skip to content

Commit 007e1a0

Browse files
committed
Improve in generics for some Publisher API
1 parent ad96ca4 commit 007e1a0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class FluxMessageChannel extends AbstractMessageChannel
4545

4646
private final List<Subscriber<? super Message<?>>> subscribers = new ArrayList<>();
4747

48-
private final Map<Publisher<Message<?>>, ConnectableFlux<?>> publishers = new ConcurrentHashMap<>();
48+
private final Map<Publisher<? extends Message<?>>, ConnectableFlux<?>> publishers = new ConcurrentHashMap<>();
4949

5050
private final Flux<Message<?>> flux;
5151

@@ -78,7 +78,7 @@ public void subscribe(Subscriber<? super Message<?>> subscriber) {
7878
}
7979

8080
@Override
81-
public void subscribeTo(Publisher<Message<?>> publisher) {
81+
public void subscribeTo(Publisher<? extends Message<?>> publisher) {
8282
ConnectableFlux<?> connectableFlux =
8383
Flux.from(publisher)
8484
.handle((message, sink) -> sink.next(send(message)))

spring-integration-core/src/main/java/org/springframework/integration/channel/ReactiveStreamsSubscribableChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
*/
2929
public interface ReactiveStreamsSubscribableChannel {
3030

31-
void subscribeTo(Publisher<Message<?>> publisher);
31+
void subscribeTo(Publisher<? extends Message<?>> publisher);
3232

3333
}

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ protected IntegrationFlowBuilder from(Class<?> serviceInterface,
228228
return IntegrationFlows.from(serviceInterface, endpointConfigurer);
229229
}
230230

231-
protected IntegrationFlowBuilder from(Publisher<Message<?>> publisher) {
231+
protected IntegrationFlowBuilder from(Publisher<? extends Message<?>> publisher) {
232232
return IntegrationFlows.from(publisher);
233233
}
234234

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public static IntegrationFlowBuilder from(Class<?> serviceInterface,
367367
* @param publisher the {@link Publisher} to subscribe to.
368368
* @return new {@link IntegrationFlowBuilder}.
369369
*/
370-
public static IntegrationFlowBuilder from(Publisher<Message<?>> publisher) {
370+
public static IntegrationFlowBuilder from(Publisher<? extends Message<?>> publisher) {
371371
FluxMessageChannel reactiveChannel = new FluxMessageChannel();
372372
reactiveChannel.subscribeTo(publisher);
373373
return from((MessageChannel) reactiveChannel);

0 commit comments

Comments
 (0)