diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java index 66ddc87bf5..484d244ad4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java @@ -117,7 +117,7 @@ public class FluxMessageChannel extends AbstractMessageChannel .publishOn(this.scheduler) .flatMap((message) -> Mono.just(message) - .handle((messageToHandle, sink) -> sendReactiveMessage(messageToHandle)) + .handle((messageToHandle, syncSink) -> sendReactiveMessage(messageToHandle)) .contextWrite(StaticMessageHeaderAccessor.getReactorContext(message))) .contextCapture() .subscribe()); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ContextHolderRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ContextHolderRequestHandlerAdvice.java index d65c0c422f..001d1074e9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ContextHolderRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ContextHolderRequestHandlerAdvice.java @@ -40,8 +40,6 @@ public class ContextHolderRequestHandlerAdvice extends AbstractRequestHandlerAdv public final Runnable contextClearHook; - private boolean enableContextPropagation; - /** * Construct an instance based on the provided hooks. * @param valueProvider The key provider function. diff --git a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java index 38829f5eca..4a2fe185c0 100644 --- a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java +++ b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.springframework.integration.zeromq.outbound; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer;